From 0fc9af633c31a5b5fe8770759fd5b18060e04d79 Mon Sep 17 00:00:00 2001 From: NaruX Date: Sun, 12 Aug 2018 16:57:08 +0200 Subject: [PATCH] Dateiliste sortiert ausgeben New code style --- doc/aclmanager.html | 2 +- doc/index-revpipycontrol.shared.html | 4 +- doc/index.html | 2 +- doc/mytools.html | 2 +- doc/revpicheckclient.html | 2 +- doc/revpidevelop.html | 2 +- doc/revpiinfo.html | 2 +- doc/revpilegacy.html | 2 +- doc/revpilogfile.html | 2 +- doc/revpioption.html | 2 +- doc/revpiplclist.html | 2 +- doc/revpiprogram.html | 2 +- doc/revpipycontrol.html | 2 +- doc/revpipycontrol.shared.ipaclmanager.html | 2 +- eric-revpipycontrol.api | 41 ++++- revpipycontrol.e4p | 161 +++++++++++++++++--- revpipycontrol/aclmanager.py | 23 ++- revpipycontrol/mytools.py | 11 +- revpipycontrol/revpicheckclient.py | 37 +++-- revpipycontrol/revpidevelop.py | 19 ++- revpipycontrol/revpiinfo.py | 13 +- revpipycontrol/revpilegacy.py | 35 +++-- revpipycontrol/revpilogfile.py | 15 +- revpipycontrol/revpioption.py | 39 +++-- revpipycontrol/revpiplclist.py | 37 +++-- revpipycontrol/revpiprogram.py | 21 ++- revpipycontrol/revpipycontrol.py | 37 +++-- revpipycontrol/shared/__init__.py | 5 + revpipycontrol/shared/ipaclmanager.py | 17 +-- setup.py | 7 +- 30 files changed, 351 insertions(+), 197 deletions(-) diff --git a/doc/aclmanager.html b/doc/aclmanager.html index b765e24..8e2f07d 100644 --- a/doc/aclmanager.html +++ b/doc/aclmanager.html @@ -10,7 +10,7 @@ aclmanager

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/index-revpipycontrol.shared.html b/doc/index-revpipycontrol.shared.html index 00f7dd6..1da8280 100644 --- a/doc/index-revpipycontrol.shared.html +++ b/doc/index-revpipycontrol.shared.html @@ -6,7 +6,9 @@

revpipycontrol.shared

- +

+Shared modules. +

diff --git a/doc/index.html b/doc/index.html index 71f598e..82b0367 100644 --- a/doc/index.html +++ b/doc/index.html @@ -13,7 +13,7 @@ Packages

- +
sharedShared modules.
diff --git a/doc/mytools.html b/doc/mytools.html index 0511c04..1dd78e8 100644 --- a/doc/mytools.html +++ b/doc/mytools.html @@ -12,7 +12,7 @@ Tools-Sammlung.

Global Attributes

- +
savefile_connections
savefile_developer
savefile_programpath
__author__
__copyright__
__license__
savefile_connections
savefile_developer
savefile_programpath

Classes

diff --git a/doc/revpicheckclient.html b/doc/revpicheckclient.html index 8fd8d2e..d9f1cc7 100644 --- a/doc/revpicheckclient.html +++ b/doc/revpicheckclient.html @@ -10,7 +10,7 @@ revpicheckclient

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpidevelop.html b/doc/revpidevelop.html index 9c74a42..b4b4a25 100644 --- a/doc/revpidevelop.html +++ b/doc/revpidevelop.html @@ -10,7 +10,7 @@ revpidevelop

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpiinfo.html b/doc/revpiinfo.html index 228cfc2..8b0f06c 100644 --- a/doc/revpiinfo.html +++ b/doc/revpiinfo.html @@ -10,7 +10,7 @@ revpiinfo

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpilegacy.html b/doc/revpilegacy.html index 5cd1125..8a03749 100644 --- a/doc/revpilegacy.html +++ b/doc/revpilegacy.html @@ -10,7 +10,7 @@ revpilegacy

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpilogfile.html b/doc/revpilogfile.html index 1bf3eac..720dc3a 100644 --- a/doc/revpilogfile.html +++ b/doc/revpilogfile.html @@ -10,7 +10,7 @@ revpilogfile

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpioption.html b/doc/revpioption.html index f6bfe29..e87b5ae 100644 --- a/doc/revpioption.html +++ b/doc/revpioption.html @@ -10,7 +10,7 @@ revpioption

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpiplclist.html b/doc/revpiplclist.html index 1669a44..6efe31d 100644 --- a/doc/revpiplclist.html +++ b/doc/revpiplclist.html @@ -10,7 +10,7 @@ revpiplclist

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpiprogram.html b/doc/revpiprogram.html index 4a8dc38..b00d344 100644 --- a/doc/revpiprogram.html +++ b/doc/revpiprogram.html @@ -10,7 +10,7 @@ revpiprogram

Global Attributes

- +
_
_
__author__
__copyright__
__license__

Classes

diff --git a/doc/revpipycontrol.html b/doc/revpipycontrol.html index 2100484..81ad05d 100644 --- a/doc/revpipycontrol.html +++ b/doc/revpipycontrol.html @@ -10,7 +10,7 @@ revpipycontrol

Global Attributes

- +
_
pycontrolversion
_
__author__
__copyright__
__license__
__version__

Classes

diff --git a/doc/revpipycontrol.shared.ipaclmanager.html b/doc/revpipycontrol.shared.ipaclmanager.html index 2c5cb69..74e8808 100644 --- a/doc/revpipycontrol.shared.ipaclmanager.html +++ b/doc/revpipycontrol.shared.ipaclmanager.html @@ -12,7 +12,7 @@ Verwaltet IP Adressen und deren ACLs.

Global Attributes

- +
None
__author__
__copyright__
__license__

Classes

diff --git a/eric-revpipycontrol.api b/eric-revpipycontrol.api index e48d393..d8723c2 100644 --- a/eric-revpipycontrol.api +++ b/eric-revpipycontrol.api @@ -18,6 +18,12 @@ aclmanager.AclManager.get_acl?4() aclmanager.AclManager.root?7 aclmanager.AclManager?1(master, minlevel, maxlevel, acl_str="", readonly=False) aclmanager._?8 +aclmanager.__author__?9 +aclmanager.__copyright__?9 +aclmanager.__license__?9 +mytools.__author__?9 +mytools.__copyright__?9 +mytools.__license__?9 mytools.addroot?4(filename) mytools.gettrans?4(proglang=None) mytools.savefile_connections?7 @@ -44,6 +50,9 @@ revpicheckclient.RevPiCheckClient.validatereturn?4(returnlist) revpicheckclient.RevPiCheckClient.writevalues?4() revpicheckclient.RevPiCheckClient?1(master, xmlcli, xmlmode=0) revpicheckclient._?8 +revpicheckclient.__author__?9 +revpicheckclient.__copyright__?9 +revpicheckclient.__license__?9 revpidevelop.RevPiDevelop._checkclose?5(event=None) revpidevelop.RevPiDevelop._createwidgets?5() revpidevelop.RevPiDevelop.app?7 @@ -56,6 +65,9 @@ revpidevelop.RevPiDevelop.root?7 revpidevelop.RevPiDevelop.select_pathfiles?4(tkevt) revpidevelop.RevPiDevelop?1(master, xmlcli, xmlmode, revpi) revpidevelop._?8 +revpidevelop.__author__?9 +revpidevelop.__copyright__?9 +revpidevelop.__license__?9 revpidevelop._loaddefaults?5(revpiname=None) revpidevelop._savedefaults?5(revpiname, settings) revpiinfo.RevPiInfo._checkclose?5(event=None) @@ -63,6 +75,9 @@ revpiinfo.RevPiInfo._createwidgets?5(extended=False) revpiinfo.RevPiInfo.visitwebsite?4(event=None) revpiinfo.RevPiInfo?1(master, xmlcli, version) revpiinfo._?8 +revpiinfo.__author__?9 +revpiinfo.__copyright__?9 +revpiinfo.__license__?9 revpilegacy.RevPiOption._changesdone?5() revpilegacy.RevPiOption._checkclose?5(event=None) revpilegacy.RevPiOption._createwidgets?5() @@ -73,6 +88,9 @@ revpilegacy.RevPiOption.xmlmod2_tail?4() revpilegacy.RevPiOption.xmlmod_tail?4() revpilegacy.RevPiOption?1(master, xmlcli) revpilegacy._?8 +revpilegacy.__author__?9 +revpilegacy.__copyright__?9 +revpilegacy.__license__?9 revpilogfile.RevPiLogfile._checkclose?5(event=None) revpilogfile.RevPiLogfile._createwidgets?5() revpilogfile.RevPiLogfile._load_log?5(textwidget, xmlcall, startposition, full) @@ -82,6 +100,9 @@ revpilogfile.RevPiLogfile.get_applog?4(full=False) revpilogfile.RevPiLogfile.get_plclog?4(full=False) revpilogfile.RevPiLogfile?1(master, xmlcli) revpilogfile._?8 +revpilogfile.__author__?9 +revpilogfile.__copyright__?9 +revpilogfile.__license__?9 revpioption.RevPiOption._changesdone?5() revpioption.RevPiOption._checkclose?5(event=None) revpioption.RevPiOption._checkvalues?5() @@ -93,6 +114,9 @@ revpioption.RevPiOption.btn_slaveacl?4() revpioption.RevPiOption.btn_xmlacl?4() revpioption.RevPiOption?1(master, xmlcli) revpioption._?8 +revpioption.__author__?9 +revpioption.__copyright__?9 +revpioption.__license__?9 revpiplclist.RevPiPlcList._checkclose?5(event=None) revpiplclist.RevPiPlcList._createwidgets?5() revpiplclist.RevPiPlcList._saveappdata?5() @@ -107,6 +131,9 @@ revpiplclist.RevPiPlcList.myapp?7 revpiplclist.RevPiPlcList.root?7 revpiplclist.RevPiPlcList?1(master) revpiplclist._?8 +revpiplclist.__author__?9 +revpiplclist.__copyright__?9 +revpiplclist.__license__?9 revpiplclist.get_connections?4() revpiprogram.RevPiProgram._checkclose?5(event=None) revpiprogram.RevPiProgram._createwidgets?5() @@ -122,6 +149,9 @@ revpiprogram.RevPiProgram.plcupload?4() revpiprogram.RevPiProgram.setpictoryrsc?4(filename=None) revpiprogram.RevPiProgram?1(master, xmlcli, xmlmode, revpi) revpiprogram._?8 +revpiprogram.__author__?9 +revpiprogram.__copyright__?9 +revpiprogram.__license__?9 revpiprogram._loaddefaults?5(revpiname=None) revpiprogram._savedefaults?5(revpiname, settings) revpipycontrol.RevPiPyControl._btnstate?5() @@ -149,7 +179,13 @@ revpipycontrol.RevPiPyControl.tmr_plcrunning?4() revpipycontrol.RevPiPyControl.visitwebsite?4() revpipycontrol.RevPiPyControl?1(master=None) revpipycontrol._?8 -revpipycontrol.pycontrolversion?7 +revpipycontrol.__author__?9 +revpipycontrol.__copyright__?9 +revpipycontrol.__license__?9 +revpipycontrol.__version__?9 +revpipycontrol.shared.__author__?9 +revpipycontrol.shared.__copyright__?9 +revpipycontrol.shared.__license__?9 revpipycontrol.shared.ipaclmanager.IpAclManager.__get_acl?6() revpipycontrol.shared.ipaclmanager.IpAclManager.__get_filename?6() revpipycontrol.shared.ipaclmanager.IpAclManager.__get_regex_acl?6() @@ -163,4 +199,7 @@ revpipycontrol.shared.ipaclmanager.IpAclManager.loadaclfile?4(filename) revpipycontrol.shared.ipaclmanager.IpAclManager.regex_acl?7 revpipycontrol.shared.ipaclmanager.IpAclManager.writeaclfile?4(filename=None, aclname=None) revpipycontrol.shared.ipaclmanager.IpAclManager?1(minlevel, maxlevel, acl=None) +revpipycontrol.shared.ipaclmanager.__author__?9 +revpipycontrol.shared.ipaclmanager.__copyright__?9 +revpipycontrol.shared.ipaclmanager.__license__?9 revpipycontrol.shared.ipaclmanager.refullmatch?4(regex, string) diff --git a/revpipycontrol.e4p b/revpipycontrol.e4p index 40f271f..c547970 100644 --- a/revpipycontrol.e4p +++ b/revpipycontrol.e4p @@ -1,33 +1,32 @@ - + en_US 66103e2eaf8a762f14d1fd51d8b1c9dcaf35a275 Python3 Console - 0.7.0 Sven Sager akira@narux.de - revpipycontrol/revpipycontrol.py + revpipycontrol/aclmanager.py + revpipycontrol/mytools.py revpipycontrol/revpicheckclient.py - setup.py - revpipycontrol/revpiplclist.py + revpipycontrol/revpidevelop.py + revpipycontrol/revpiinfo.py + revpipycontrol/revpilegacy.py revpipycontrol/revpilogfile.py revpipycontrol/revpioption.py + revpipycontrol/revpiplclist.py revpipycontrol/revpiprogram.py - revpipycontrol/mytools.py - revpipycontrol/revpiinfo.py - revpipycontrol/aclmanager.py - revpipycontrol/revpilegacy.py - revpipycontrol/shared/ipaclmanager.py + revpipycontrol/revpipycontrol.py revpipycontrol/shared/__init__.py - revpipycontrol/revpidevelop.py + revpipycontrol/shared/ipaclmanager.py + setup.py @@ -36,8 +35,8 @@ data doc - stdeb.cfg eric-revpipycontrol.api + stdeb.cfg revpipycontrol/revpipycontrol.py @@ -142,9 +141,6 @@ - - - @@ -244,14 +240,6 @@ False - - sourceExtensions - - - - - - useRecursion @@ -266,6 +254,133 @@ + + PYLINT + + + + + configFile + + + /home/akira/Entwicklung/eric/revpipyplc/revpipycontrol/default.cnf + + + dialogReport + + + False + + + disabledMessages + + + + + + enableBasic + + + True + + + enableClasses + + + True + + + enableDesign + + + True + + + enableExceptions + + + True + + + enableFormat + + + True + + + enableImports + + + True + + + enableLogging + + + True + + + enableMetrics + + + True + + + enableMiscellaneous + + + True + + + enableNewstyle + + + True + + + enableSimilarities + + + True + + + enableStringFormat + + + True + + + enableTypecheck + + + True + + + enableVariables + + + True + + + enabledMessages + + + + + + htmlReport + + + True + + + txtReport + + + False + + + Pep8Checker diff --git a/revpipycontrol/aclmanager.py b/revpipycontrol/aclmanager.py index 72e19b2..b193753 100644 --- a/revpipycontrol/aclmanager.py +++ b/revpipycontrol/aclmanager.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""Manager für ACL Einträge.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import tkinter import tkinter.messagebox as tkmsg from mytools import gettrans @@ -56,8 +55,8 @@ class AclManager(ttk.Frame): self.aclinfo = ttk.Frame(self) for acltext in self.__dict_acltext: lbl = ttk.Label(self.aclinfo) - lbl["text"] = _("Level") + " {}: {}".format( - acltext, self.__dict_acltext[acltext] + lbl["text"] = _("Level") + " {id}: {text}".format( + id=acltext, text=self.__dict_acltext[acltext] ) lbl.pack(anchor="w") @@ -276,12 +275,12 @@ class AclManager(ttk.Frame): ask = tkmsg.askyesno( _("Question"), _("Do you really want to delete the following item? \n" - "\nIP: {} / Level: {}").format(*lst_ipacl), + "\nIP: {0} / Level: {1}").format(*lst_ipacl), parent=self.master, default="no" ) if ask: new_acl = self.__acl.acl.replace( - "{},{}".format(*lst_ipacl), "" + "{0},{1}".format(*lst_ipacl), "" ).replace(" ", " ") if self.__acl.loadacl(new_acl.strip()): @@ -354,7 +353,7 @@ class AclManager(ttk.Frame): def _savefields(self): u"""Übernimmt neuen ACL Eintrag.""" - new_acl = "{}.{}.{}.{},{}".format( + new_acl = "{0}.{1}.{2}.{3},{4}".format( self.var_ip1.get(), self.var_ip2.get(), self.var_ip3.get(), @@ -386,8 +385,8 @@ class AclManager(ttk.Frame): acltext = property(__get_acltext, __set_acltext) +# Debugging if __name__ == "__main__": root = AclManager(tkinter.Tk(), 0, 9, " 192.168.50.100,2 127.0.0.*,1") root.acltext = {0: "Keine Rechte", 1: "Hohe Rechte"} root.mainloop() - print(root.acl) diff --git a/revpipycontrol/mytools.py b/revpipycontrol/mytools.py index 4356578..631124e 100644 --- a/revpipycontrol/mytools.py +++ b/revpipycontrol/mytools.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# """Tools-Sammlung.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import gettext import locale import sys diff --git a/revpipycontrol/revpicheckclient.py b/revpipycontrol/revpicheckclient.py index f75b103..5b475a1 100644 --- a/revpipycontrol/revpicheckclient.py +++ b/revpipycontrol/revpicheckclient.py @@ -1,13 +1,15 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# -# Thranks to: http://stackoverflow.com/questions/3085696/adding-a- -# scrollbar-to-a-group-of-widgets-in-tkinter -u"""Fenstererweiterung für den 'watch modus'.""" +u"""Fenstererweiterung für den 'watch modus'. + +Thranks to: http://stackoverflow.com/questions/3085696/adding-a- +scrollbar-to-a-group-of-widgets-in-tkinter + +""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import pickle import tkinter import tkinter.messagebox as tkmsg @@ -108,8 +110,11 @@ class RevPiCheckClient(tkinter.Frame): io[5].set(self.__oldvalue) tkmsg.showerror( _("Error"), - _("Given value for Output '{}' is not valid! \nReset to ""'{}'" - "").format(self.dict_devices[device], self.__oldvalue), + _("Given value for Output '{0}' is not valid! \n" + "Reset to '{1}'").format( + self.dict_devices[device], + self.__oldvalue + ), parent=self.dict_wins[device] ) @@ -213,7 +218,7 @@ class RevPiCheckClient(tkinter.Frame): for dev in self.lst_devices: win = tkinter.Toplevel(self) - win.wm_title("{} | {}".format(dev, self.dict_devices[dev])) + win.wm_title("{0} | {1}".format(dev, self.dict_devices[dev])) win.protocol( "WM_DELETE_WINDOW", lambda win=win: self.__hidewin(win) @@ -235,7 +240,7 @@ class RevPiCheckClient(tkinter.Frame): # Button erstellen btn = tkinter.Button(devgrp) btn["command"] = lambda win=win: self.__showwin(win) - btn["text"] = "{} | {}".format(dev, self.dict_devices[dev]) + btn["text"] = "{0} | {1}".format(dev, self.dict_devices[dev]) btn.pack(**cfxpxy53) # Steuerungsfunktionen @@ -311,7 +316,7 @@ class RevPiCheckClient(tkinter.Frame): try: ba_values = bytearray(self.cli.ps_values().data) self.err_workvalues = 0 - except: + except Exception: if self.autorw.get(): self.err_workvalues += 1 else: @@ -390,7 +395,7 @@ class RevPiCheckClient(tkinter.Frame): if not self.autorw.get(): try: self.chk_auto["state"] = "normal" - except: + except Exception: pass return None @@ -436,7 +441,7 @@ class RevPiCheckClient(tkinter.Frame): # Fehlermeldungen erstellen devicename = self.dict_devices[lst_result[0]] str_errmsg += _( - "Error set value of device '{}' Output '{}': {} \n" + "Error set value of device '{0}' Output '{1}': {2} \n" ).format(devicename, lst_result[1], lst_result[3]) if str_errmsg != "": tkmsg.showerror(_("Error"), str_errmsg) diff --git a/revpipycontrol/revpidevelop.py b/revpipycontrol/revpidevelop.py index 8fa8cdb..349c301 100644 --- a/revpipycontrol/revpidevelop.py +++ b/revpipycontrol/revpidevelop.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""PLC Programm und Konfig hoch und runterladen.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import gzip import os import pickle @@ -53,7 +52,7 @@ def _savedefaults(revpiname, settings): dict_all[revpiname] = settings with open(savefile, "wb") as fh: pickle.dump(dict_all, fh) - except: + except Exception: return False return True @@ -186,7 +185,7 @@ class RevPiDevelop(ttk.Frame): ustatus = self.xmlcli.plcupload( Binary(gzip.compress(fh.read())), sendname ) - except: + except Exception: ec = -2 break @@ -258,7 +257,7 @@ class RevPiDevelop(ttk.Frame): # Dateiliste erstellen filecount = 0 for tup_walk in os.walk(self.watchpath): - for filename in tup_walk[2]: + for filename in sorted(tup_walk[2]): fullname = os.path.join(tup_walk[0], filename) self.trv_files.insert( "", "end", fullname, @@ -286,7 +285,7 @@ class RevPiDevelop(ttk.Frame): for watchfile in self.watchfiles.copy(): try: self.trv_files.item(watchfile) - except: + except Exception: self.watchfiles.remove(watchfile) self.trv_files.selection_set(self.watchfiles) diff --git a/revpipycontrol/revpiinfo.py b/revpipycontrol/revpiinfo.py index 58393e5..f17c75c 100644 --- a/revpipycontrol/revpiinfo.py +++ b/revpipycontrol/revpiinfo.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""Programminformationen anzeigen.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import tkinter import tkinter.font as tkf import webbrowser @@ -55,7 +54,7 @@ class RevPiInfo(tkinter.Frame): lbl.pack(pady=5) lbl = tkinter.Label(self) lbl["font"] = fntmid - lbl["text"] = _("Version: {}").format(self.version) + lbl["text"] = _("Version: {0}").format(self.version) lbl.bind( "", lambda event: self._createwidgets(extended=not extended) diff --git a/revpipycontrol/revpilegacy.py b/revpipycontrol/revpilegacy.py index 115b947..d0db190 100644 --- a/revpipycontrol/revpilegacy.py +++ b/revpipycontrol/revpilegacy.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""Alte Klassen laden hier, bevor sie entsorgt werden.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import tkinter import tkinter.messagebox as tkmsg from mytools import gettrans @@ -23,7 +22,7 @@ class RevPiOption(tkinter.Frame): @return None""" try: self.dc = xmlcli.get_config() - except: + except Exception: self.dc = None return None @@ -46,17 +45,17 @@ class RevPiOption(tkinter.Frame): u"""Prüft ob sich die Einstellungen geändert haben. @return True, wenn min. eine Einstellung geändert wurde""" return ( - self.var_start.get() != self.dc.get("autostart", "1") - or self.var_reload.get() != self.dc.get("autoreload", "1") - or self.var_zexit.get() != self.dc.get("zeroonexit", "0") - or self.var_zerr.get() != self.dc.get("zeroonerror", "0") - or self.var_startpy.get() != self.dc.get("plcprogram", "none.py") - or self.var_startargs.get() != self.dc.get("plcarguments", "") - or self.var_pythonver.get() != self.dc.get("pythonversion", "3") - or self.var_slave.get() != self.dc.get("plcslave", "0") - or self.var_xmlon.get() != (self.dc.get("xmlrpc", 0) >= 1) - or self.var_xmlmod2.get() != (self.dc.get("xmlrpc", 0) >= 2) - or self.var_xmlmod3.get() != (self.dc.get("xmlrpc", 0) >= 3) + self.var_start.get() != self.dc.get("autostart", "1") or + self.var_reload.get() != self.dc.get("autoreload", "1") or + self.var_zexit.get() != self.dc.get("zeroonexit", "0") or + self.var_zerr.get() != self.dc.get("zeroonerror", "0") or + self.var_startpy.get() != self.dc.get("plcprogram", "none.py") or + self.var_startargs.get() != self.dc.get("plcarguments", "") or + self.var_pythonver.get() != self.dc.get("pythonversion", "3") or + self.var_slave.get() != self.dc.get("plcslave", "0") or + self.var_xmlon.get() != (self.dc.get("xmlrpc", 0) >= 1) or + self.var_xmlmod2.get() != (self.dc.get("xmlrpc", 0) >= 2) or + self.var_xmlmod3.get() != (self.dc.get("xmlrpc", 0) >= 3) # or self.var_xmlport.get() != self.dc.get("xmlrpcport", "55123") ) diff --git a/revpipycontrol/revpilogfile.py b/revpipycontrol/revpilogfile.py index 5666b4b..735ada7 100644 --- a/revpipycontrol/revpilogfile.py +++ b/revpipycontrol/revpilogfile.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""Zeigt die Logfiles an.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import tkinter from mytools import gettrans @@ -106,7 +105,7 @@ class RevPiLogfile(tkinter.Frame): self.applog, self.xmlcli.load_applog, self.mrkapp, full ) self.errapp = 0 - except: + except Exception: self.errapp += 1 # Timer neu starten @@ -122,7 +121,7 @@ class RevPiLogfile(tkinter.Frame): self.plclog, self.xmlcli.load_plclog, self.mrkplc, full ) self.errplc = 0 - except: + except Exception: self.errplc += 1 # Timer neu starten diff --git a/revpipycontrol/revpioption.py b/revpipycontrol/revpioption.py index 963260a..ac31a2d 100644 --- a/revpipycontrol/revpioption.py +++ b/revpipycontrol/revpioption.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""Optionsfenster.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import tkinter import tkinter.messagebox as tkmsg from aclmanager import AclManager @@ -24,7 +23,7 @@ class RevPiOption(tkinter.Frame): @return None""" try: self.dc = xmlcli.get_config() - except: + except Exception: self.dc = None return None @@ -48,20 +47,20 @@ class RevPiOption(tkinter.Frame): u"""Prüft ob sich die Einstellungen geändert haben. @return True, wenn min. eine Einstellung geändert wurde""" return ( - self.var_start.get() != self.dc.get("autostart", 1) - or self.var_reload.get() != self.dc.get("autoreload", 1) - or self.var_reload_delay.get() != - str(self.dc.get("autoreloaddelay", 5)) - or self.var_zexit.get() != self.dc.get("zeroonexit", 0) - or self.var_zerr.get() != self.dc.get("zeroonerror", 0) + self.var_start.get() != self.dc.get("autostart", 1) or + self.var_reload.get() != self.dc.get("autoreload", 1) or + self.var_reload_delay.get() != + str(self.dc.get("autoreloaddelay", 5)) or + self.var_zexit.get() != self.dc.get("zeroonexit", 0) or + self.var_zerr.get() != self.dc.get("zeroonerror", 0) or # TODO: rtlevel (0) - or self.var_startpy.get() != self.dc.get("plcprogram", "none.py") - or self.var_startargs.get() != self.dc.get("plcarguments", "") - or self.var_pythonver.get() != self.dc.get("pythonversion", 3) - or self.var_slave.get() != self.dc.get("plcslave", 0) - or self.var_slaveacl.get() != self.dc.get("plcslaveacl", "") - or self.var_xmlon.get() != self.dc.get("xmlrpc", 0) - or self.var_xmlacl.get() != self.dc.get("xmlrpcacl", "") + self.var_startpy.get() != self.dc.get("plcprogram", "none.py") or + self.var_startargs.get() != self.dc.get("plcarguments", "") or + self.var_pythonver.get() != self.dc.get("pythonversion", 3) or + self.var_slave.get() != self.dc.get("plcslave", 0) or + self.var_slaveacl.get() != self.dc.get("plcslaveacl", "") or + self.var_xmlon.get() != self.dc.get("xmlrpc", 0) or + self.var_xmlacl.get() != self.dc.get("xmlrpcacl", "") ) def _checkclose(self, event=None): diff --git a/revpipycontrol/revpiplclist.py b/revpipycontrol/revpiplclist.py index acb384e..2f5f076 100644 --- a/revpipycontrol/revpiplclist.py +++ b/revpipycontrol/revpiplclist.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""Fenster um RevPi-Verbindungen einzurichten.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import os.path import pickle import tkinter @@ -152,20 +151,20 @@ class RevPiPlcList(tkinter.Frame): with open(savefile, "wb") as fh: pickle.dump(self._connections, fh) self.changes = False - except: + except Exception: return False # Andere Einstellungen aufräumen - dict = developloaddefaults() - for revpi in tuple(dict.keys()): + dict_o = developloaddefaults() + for revpi in tuple(dict_o.keys()): if revpi not in self._connections: - del dict[revpi] - developsavedefaults(None, dict) - dict = programloaddefaults() - for revpi in tuple(dict.keys()): + del dict_o[revpi] + developsavedefaults(None, dict_o) + dict_o = programloaddefaults() + for revpi in tuple(dict_o.keys()): if revpi not in self._connections: - del dict[revpi] - programsavedefaults(None, dict) + del dict_o[revpi] + programsavedefaults(None, dict_o) return True @@ -202,7 +201,7 @@ class RevPiPlcList(tkinter.Frame): item = self.list_conn.get(item_index[0]) ask = tkmsg.askyesno( _("Question"), - _("Do you really want to delete the selected connection '{}'?" + _("Do you really want to delete the selected connection '{0}'?" "").format(item), parent=self.master ) @@ -250,9 +249,9 @@ class RevPiPlcList(tkinter.Frame): def evt_keypress(self, evt=None): u"""Passt bei Tastendruck den Status der Buttons an.""" okvalue = "normal" if ( - self.var_address.get() != "" - and self.var_name.get() != "" - and self.var_port.get() != "" + self.var_address.get() != "" and + self.var_name.get() != "" and + self.var_port.get() != "" ) else "disabled" self.btn_add["state"] = okvalue diff --git a/revpipycontrol/revpiprogram.py b/revpipycontrol/revpiprogram.py index d9e00e8..b5a9527 100644 --- a/revpipycontrol/revpiprogram.py +++ b/revpipycontrol/revpiprogram.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# RevPiPyControl -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# u"""PLC Programm und Konfig hoch und runterladen.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + import gzip import os import pickle @@ -56,7 +55,7 @@ def _savedefaults(revpiname, settings): dict_all[revpiname] = settings with open(savefile, "wb") as fh: pickle.dump(dict_all, fh) - except: + except Exception: return False return True @@ -325,7 +324,7 @@ class RevPiProgram(tkinter.Frame): if fh is not None: try: fh.write(self.xmlcli.get_pictoryrsc().data) - except: + except Exception: tkmsg.showerror( _("Error"), _("Could not load and save file!"), @@ -356,7 +355,7 @@ class RevPiProgram(tkinter.Frame): if fh is not None: try: fh.write(self.xmlcli.get_procimg().data) - except: + except Exception: tkmsg.showerror( _("Error"), _("Could not load and save file!"), @@ -561,7 +560,7 @@ class RevPiProgram(tkinter.Frame): self.opt["typedown"] = self.var_typedown.get() self.opt["picdown"] = self.var_picdown.get() - except: + except Exception: raise tkmsg.showerror( _("Error"), @@ -725,7 +724,7 @@ class RevPiProgram(tkinter.Frame): try: ustatus = self.xmlcli.plcupload( Binary(gzip.compress(fh.read())), sendname) - except: + except Exception: ec = -2 break diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py index 1a5d023..befddc8 100755 --- a/revpipycontrol/revpipycontrol.py +++ b/revpipycontrol/revpipycontrol.py @@ -1,13 +1,12 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- -# -# RevPiPyControl -# Version: see global var pycontrolverion -# -# Webpage: https://revpimodio.org/revpipyplc/ -# (c) Sven Sager, License: LGPLv3 -# -u"""Hauptprogramm.""" +u"""RevPiPyControl main program.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" +__version__ = "0.7.0" + import revpicheckclient import revpidevelop import revpiinfo @@ -26,8 +25,6 @@ from xmlrpc.client import ServerProxy # Übersetzung laden _ = gettrans() -pycontrolversion = "0.7.0" - class RevPiPyControl(tkinter.Frame): @@ -92,7 +89,7 @@ class RevPiPyControl(tkinter.Frame): self.debugframe = None try: self.cli.psstop() - except: + except Exception: pass def _closeapp(self, event=None): @@ -212,7 +209,7 @@ class RevPiPyControl(tkinter.Frame): socket.setdefaulttimeout(2) sp = ServerProxy( - "http://{}:{}".format( + "http://{0}:{1}".format( self.dict_conn[text][0], int(self.dict_conn[text][1]) ) ) @@ -221,18 +218,18 @@ class RevPiPyControl(tkinter.Frame): self.xmlfuncs = sp.system.listMethods() self.xmlmode = sp.xmlmodus() self.revpipyversion = list(map(int, sp.version().split("."))) - except: + except Exception: self.servererror() else: self._closeall() socket.setdefaulttimeout(6) self.cli = ServerProxy( - "http://{}:{}".format( + "http://{0}:{1}".format( self.dict_conn[text][0], int(self.dict_conn[text][1]) ) ) self.revpiname = text - self.var_conn.set("{} - {}:{}".format( + self.var_conn.set("{0} - {1}:{2}".format( text, self.dict_conn[text][0], int(self.dict_conn[text][1]) )) self.mbar.entryconfig("PLC", state="normal") @@ -242,7 +239,7 @@ class RevPiPyControl(tkinter.Frame): win = tkinter.Toplevel(self) win.focus_set() win.grab_set() - revpiinfo.RevPiInfo(win, self.cli, pycontrolversion) + revpiinfo.RevPiInfo(win, self.cli, __version__) self.wait_window(win) self.dict_conn = revpiplclist.get_connections() self._fillconnbar() @@ -255,7 +252,7 @@ class RevPiPyControl(tkinter.Frame): if "psstart" not in self.xmlfuncs: tkmsg.showwarning( _("Warning"), - _("The watch mode ist not supported in version {} " + _("The watch mode ist not supported in version {0} " "of RevPiPyLoad on your RevPi! You need at least version " "0.5.3! Maybe the python3-revpimodio2 module is not " "installed on your RevPi at least version 2.0.0." @@ -273,7 +270,7 @@ class RevPiPyControl(tkinter.Frame): self.debugframe = revpicheckclient.RevPiCheckClient( self.main_frame, self.cli, self.xmlmode ) - except: + except Exception: tkmsg.showwarning( _("Error"), _("Can not load piCtory configuration. \n" @@ -336,7 +333,7 @@ class RevPiPyControl(tkinter.Frame): if "load_plclog" not in self.xmlfuncs: tkmsg.showwarning( _("Warning"), - _("This version of Logviewer ist not supported in version {} " + _("This version of Logviewer ist not supported in version {0} " "of RevPiPyLoad on your RevPi! You need at least version " "0.4.1.").format(self.cli.version()), parent=self.master @@ -442,7 +439,7 @@ class RevPiPyControl(tkinter.Frame): else: try: plcec = self.cli.plcexitcode() - except: + except Exception: self.errcount += 1 if self.errcount >= 5: self.var_status.set("SERVER ERROR") diff --git a/revpipycontrol/shared/__init__.py b/revpipycontrol/shared/__init__.py index d059206..0af3bfc 100644 --- a/revpipycontrol/shared/__init__.py +++ b/revpipycontrol/shared/__init__.py @@ -1 +1,6 @@ +# -*- coding: utf-8 -*- """Shared modules.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" diff --git a/revpipycontrol/shared/ipaclmanager.py b/revpipycontrol/shared/ipaclmanager.py index 5bf9aea..d1aa9fe 100644 --- a/revpipycontrol/shared/ipaclmanager.py +++ b/revpipycontrol/shared/ipaclmanager.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# -# IpAclManager -# -# (c) Sven Sager, License: LGPLv3 -# Version 0.1.0 -# """Verwaltet IP Adressen und deren ACLs.""" + +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "GPLv3" + from os import access, R_OK, W_OK from re import match as rematch @@ -66,7 +65,7 @@ class IpAclManager(): return ACLs als """ str_acl = "" for aclip in sorted(self.__dict_acl): - str_acl += "{},{} ".format(aclip, self.__dict_acl[aclip]) + str_acl += "{0},{1} ".format(aclip, self.__dict_acl[aclip]) return str_acl.strip() def __get_filename(self): @@ -173,14 +172,14 @@ class IpAclManager(): if not access(filename, W_OK): return False - header = "# {}Access Control List (acl)\n" \ + header = "# {0}Access Control List (acl)\n" \ "# One entry per Line IPADRESS,LEVEL\n" \ "#\n".format("" if aclname is None else aclname + " ") with open(filename, "w") as fh: fh.write(header) for aclip in sorted(self.__dict_acl): - fh.write("{},{}\n".format(aclip, self.__dict_acl[aclip])) + fh.write("{0},{1}\n".format(aclip, self.__dict_acl[aclip])) return True diff --git a/setup.py b/setup.py index cbed974..e1eeed6 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# -# (c) Sven Sager, License: LGPLv3 -# """Setupscript fuer RevPiPyLoad.""" +__author__ = "Sven Sager" +__copyright__ = "Copyright (C) 2018 Sven Sager" +__license__ = "LGPLv3" + import distutils.command.install_egg_info from sys import platform from glob import glob