wn/modbusmaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix style issues

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2019-09-10 16:18:35 +02:00
parent c1bf7fd13a
commit 77d01ca675
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/CmdServer.py
View File

@ -8,6 +8,7 @@ import RegisterDatapoint
import logging import logging
import Converters import Converters
class CmdInterpreterException(ValueError): class CmdInterpreterException(ValueError):
pass pass
@ -32,7 +33,7 @@ class CmdInterpreter(cmd.Cmd):
self.registers = registers self.registers = registers
self.prompt = "test8> " self.prompt = "test8> "
self.intro = "test8 admin interface" self.intro = "test8 admin interface"
self.splitterRe = re.compile('\s+') self.splitterRe = re.compile(r'\s+')
self.logger = logging.getLogger('CmdInterpreter') self.logger = logging.getLogger('CmdInterpreter')
def onecmd(self, line): def onecmd(self, line):
@ -50,15 +51,14 @@ class CmdInterpreter(cmd.Cmd):
self.stdout.write(text) self.stdout.write(text)
self.stdout.write("\n\r") self.stdout.write("\n\r")
def __listConverterNames(self): def __listConverterNames(self):
return [name for name in Converters.Converters] return [name for name in Converters.Converters]
def do_add_hr(self, arg): def do_add_hr(self, arg):
try: try:
(label, unit, address, count, scanrate, readTopic, writeTopic, feedbackTopic, converter) = (label, unit, address, count,
self.splitterRe.split(arg) scanrate, readTopic, writeTopic,
feedbackTopic, converter) = self.splitterRe.split(arg)
self.__println("Label: {0}".format(label)) self.__println("Label: {0}".format(label))
self.__println("Unit: {0}".format(unit)) self.__println("Unit: {0}".format(unit))
self.__println("Address: {0}".format(address)) self.__println("Address: {0}".format(address))
@ -112,8 +112,8 @@ class CmdInterpreter(cmd.Cmd):
self.__println("<WriteTopic> Topic to be subscribe to receive data to be") self.__println("<WriteTopic> Topic to be subscribe to receive data to be")
self.__println(" written") self.__println(" written")
self.__println("<FeedbackTopic> Topic to publish feedback after a write process,") self.__println("<FeedbackTopic> Topic to publish feedback after a write process,")
self.__println("<Converter> Converter for data, one of {0}".format(', '.join(self.__listConverterNames()))) self.__println("<Converter> Converter for data, one of {0}"
.format(', '.join(self.__listConverterNames())))
def do_add_coil(self, arg): def do_add_coil(self, arg):
try: try:
@ -212,7 +212,8 @@ class CmdInterpreter(cmd.Cmd):
self.__println("<ScanRate> Scanrate in seconds (float)") self.__println("<ScanRate> Scanrate in seconds (float)")
self.__println("<UpdateOnly> Publish only when value has changed") self.__println("<UpdateOnly> Publish only when value has changed")
self.__println("<ReadTopic> Topic to publish read data") self.__println("<ReadTopic> Topic to publish read data")
self.__println("<Converter> Converter for data, one of {0}".format(', '.join(self.__listConverterNames()))) self.__println("<Converter> Converter for data, one of {0}"
.format(', '.join(self.__listConverterNames())))
def do_add_di(self, arg): def do_add_di(self, arg):
try: try:
@ -293,7 +294,8 @@ class CmdInterpreter(cmd.Cmd):
ratio = -1 ratio = -1
else: else:
ratio = float(r.errorCount) / float(processCount) ratio = float(r.errorCount) / float(processCount)
self.__println("#{0:2d}: {1:15s} ({2:2d}, {3:5d}), rc: {4:7d}, wc: {5:7d}, pc: {6:7d}, ec: {7:7d}, q: {8:1.4f}" self.__println("#{0:2d}: {1:15s} ({2:2d}, {3:5d}), rc: {4:7d}, "
"wc: {5:7d}, pc: {6:7d}, ec: {7:7d}, q: {8:1.4f}"
.format(i, r.label, r.unit, r.address, r.readCount, r.writeCount, .format(i, r.label, r.unit, r.address, r.readCount, r.writeCount,
processCount, r.errorCount, ratio)) processCount, r.errorCount, ratio))
@ -404,7 +406,6 @@ class CmdInterpreter(cmd.Cmd):
self.__println("Reload the register file, overwrite all unsaved changes.") self.__println("Reload the register file, overwrite all unsaved changes.")
class CmdHandle(socketserver.StreamRequestHandler): class CmdHandle(socketserver.StreamRequestHandler):
def handle(self): def handle(self):
logger = logging.getLogger('CmdHandle') logger = logging.getLogger('CmdHandle')
@ -416,25 +417,28 @@ class CmdHandle(socketserver.StreamRequestHandler):
except ConnectionAbortedError as e: except ConnectionAbortedError as e:
logger.info("Cmd handle externally interrupted") logger.info("Cmd handle externally interrupted")
class MyThreadingTCPServer(socketserver.ThreadingTCPServer): class MyThreadingTCPServer(socketserver.ThreadingTCPServer):
def __init__(self, host, handler, userData): def __init__(self, host, handler, userData):
super().__init__(host, handler) super().__init__(host, handler)
self.userData = userData self.userData = userData
class MyCmdUserData(object): class MyCmdUserData(object):
def __init__(self, config, notifier, registers): def __init__(self, config, notifier, registers):
self.config = config self.config = config
self.notifier = notifier self.notifier = notifier
self.registers = registers self.registers = registers
class CmdServer(threading.Thread): class CmdServer(threading.Thread):
def __init__(self, config, notifier, registers): def __init__(self, config, notifier, registers):
super().__init__() super().__init__()
self.config = config self.config = config
self.server = MyThreadingTCPServer((config.cmdAddress, config.cmdPort), CmdHandle, MyCmdUserData(config, notifier, registers)) self.server = MyThreadingTCPServer((config.cmdAddress, config.cmdPort),
CmdHandle,
MyCmdUserData(config, notifier, registers))
# self.daemon = True # self.daemon = True
def run(self): def run(self):
self.server.serve_forever() self.server.serve_forever()