diff options
author | Chris Liechti <cliechti@gmx.net> | 2016-01-24 23:55:05 +0100 |
---|---|---|
committer | Chris Liechti <cliechti@gmx.net> | 2016-01-24 23:55:05 +0100 |
commit | 3d3e71e73f742a20f53b6757e5af58f4abb28590 (patch) | |
tree | 918a6a236838df353c14cbf7e7b94d265936f106 /examples | |
parent | 4233c6525d8324272a06ba351e5dfd066d997438 (diff) | |
download | pyserial-git-3d3e71e73f742a20f53b6757e5af58f4abb28590.tar.gz |
style: some of the suggestions from flake8
Diffstat (limited to 'examples')
-rwxr-xr-x | examples/port_publisher.py | 21 | ||||
-rw-r--r-- | examples/setup-miniterm-py2exe.py | 13 | ||||
-rw-r--r-- | examples/setup-rfc2217_server-py2exe.py | 8 | ||||
-rw-r--r-- | examples/setup-wxTerminal-py2exe.py | 18 | ||||
-rwxr-xr-x | examples/wxSerialConfigDialog.py | 1 | ||||
-rwxr-xr-x | examples/wxTerminal.py | 3 |
6 files changed, 31 insertions, 33 deletions
diff --git a/examples/port_publisher.py b/examples/port_publisher.py index 083575d..61a3307 100755 --- a/examples/port_publisher.py +++ b/examples/port_publisher.py @@ -341,11 +341,11 @@ if __name__ == '__main__': import argparse VERBOSTIY = [ - logging.ERROR, # 0 - logging.WARNING, # 1 (default) - logging.INFO, # 2 - logging.DEBUG, # 3 - ] + logging.ERROR, # 0 + logging.WARNING, # 1 (default) + logging.INFO, # 2 + logging.DEBUG, # 3 + ] parser = argparse.ArgumentParser(usage="""\ %(prog)s [options] @@ -355,7 +355,7 @@ a TCP/IP <-> serial port gateway (implements RFC 2217). If running as daemon, write to syslog. Otherwise write to stdout. """, - epilog="""\ + epilog="""\ NOTE: no security measures are implemented. Anyone can remotely connect to this service over the network. @@ -418,7 +418,6 @@ terminated, it waits for the next connect. action="count", help="increase diagnostic messages") - args = parser.parse_args() # set up logging @@ -430,9 +429,11 @@ terminated, it waits for the next connect. class WriteFlushed: def __init__(self, fileobj): self.fileobj = fileobj + def write(self, s): self.fileobj.write(s) self.fileobj.flush() + def close(self): self.fileobj.close() sys.stdout = sys.stderr = WriteFlushed(open(args.logfile, 'a')) @@ -472,24 +473,28 @@ terminated, it waits for the next connect. if args.logfile is None: import syslog syslog.openlog("serial port publisher") + # redirect output to syslog class WriteToSysLog: def __init__(self): self.buffer = '' + def write(self, s): self.buffer += s if '\n' in self.buffer: output, self.buffer = self.buffer.split('\n', 1) syslog.syslog(output) + def flush(self): syslog.syslog(self.buffer) self.buffer = '' + def close(self): self.flush() sys.stdout = sys.stderr = WriteToSysLog() # ensure the that the daemon runs a normal user, if run as root - #if os.getuid() == 0: + # if os.getuid() == 0: # name, passwd, uid, gid, desc, home, shell = pwd.getpwnam('someuser') # os.setgid(gid) # set group first # os.setuid(uid) # set user diff --git a/examples/setup-miniterm-py2exe.py b/examples/setup-miniterm-py2exe.py index 0bc5c19..8784bfe 100644 --- a/examples/setup-miniterm-py2exe.py +++ b/examples/setup-miniterm-py2exe.py @@ -5,8 +5,6 @@ # SPDX-License-Identifier: BSD-3-Clause from distutils.core import setup -import glob -import os import sys import py2exe @@ -18,20 +16,19 @@ import serial.tools.miniterm sys.argv.extend("py2exe --bundle 1".split()) setup( - name = 'miniterm', - zipfile = None, - options = {"py2exe": { + name='miniterm', + zipfile=None, + options={"py2exe": { 'dll_excludes': [], 'includes': [ 'serial.urlhandler.protocol_hwgrep', 'serial.urlhandler.protocol_rfc2217', - 'serial.urlhandler.protocol_socket', 'serial.urlhandler.protocol_loop',], + 'serial.urlhandler.protocol_socket', 'serial.urlhandler.protocol_loop'], 'dist_dir': 'bin', 'excludes': ['serialjava', 'serialposix', 'serialcli'], 'compressed': 1, } }, - console = [ - #~ "miniterm.py", + console=[ serial.tools.miniterm.__file__ ], ) diff --git a/examples/setup-rfc2217_server-py2exe.py b/examples/setup-rfc2217_server-py2exe.py index 04670ca..b12f33f 100644 --- a/examples/setup-rfc2217_server-py2exe.py +++ b/examples/setup-rfc2217_server-py2exe.py @@ -5,8 +5,6 @@ # SPDX-License-Identifier: BSD-3-Clause from distutils.core import setup -import glob -import os import sys import py2exe @@ -17,17 +15,17 @@ sys.argv.extend("py2exe --bundle 1".split()) setup( name='rfc2217_server', zipfile=None, - options = {"py2exe": { + options={"py2exe": { 'dll_excludes': [], 'includes': [ 'serial.urlhandler.protocol_hwgrep', 'serial.urlhandler.protocol_rfc2217', - 'serial.urlhandler.protocol_socket', 'serial.urlhandler.protocol_loop',], + 'serial.urlhandler.protocol_socket', 'serial.urlhandler.protocol_loop'], 'dist_dir': 'bin', 'excludes': ['serialjava', 'serialposix', 'serialcli'], 'compressed': 1, }, }, - console = [ + console=[ "rfc2217_server.py", ], ) diff --git a/examples/setup-wxTerminal-py2exe.py b/examples/setup-wxTerminal-py2exe.py index 9e0add7..caff719 100644 --- a/examples/setup-wxTerminal-py2exe.py +++ b/examples/setup-wxTerminal-py2exe.py @@ -17,25 +17,25 @@ sys.argv.append('py2exe') icon = os.path.join(os.path.dirname(sys.executable), 'py.ico') setup( - options = {'py2exe': { + options={'py2exe': { 'excludes': ['javax.comm'], 'optimize': 2, 'dist_dir': 'dist', } }, - name = "wxTerminal", - windows = [ + name="wxTerminal", + windows=[ { 'script': "wxTerminal.py", 'icon_resources': [(0x0004, icon)] }, ], - zipfile = "stuff.lib", + zipfile="stuff.lib", - description = "Simple serial terminal application", - version = "0.1", - author = "Chris Liechti", - author_email = "cliechti@gmx.net", - url = "https://github.com/pyserial/pyserial/", + description="Simple serial terminal application", + version="0.1", + author="Chris Liechti", + author_email="cliechti@gmx.net", + url="https://github.com/pyserial/pyserial/", ) diff --git a/examples/wxSerialConfigDialog.py b/examples/wxSerialConfigDialog.py index bb79d87..a29b67d 100755 --- a/examples/wxSerialConfigDialog.py +++ b/examples/wxSerialConfigDialog.py @@ -211,7 +211,6 @@ class SerialConfigDialog(wx.Dialog): success = True self.serial.port = self.ports[self.choice_port.GetSelection()] if self.show & SHOW_BAUDRATE: - #~ self.serial.baudrate = self.serial.BAUDRATES[self.combo_box_baudrate.GetSelection()] try: b = int(self.combo_box_baudrate.GetValue()) except ValueError: diff --git a/examples/wxTerminal.py b/examples/wxTerminal.py index a02a418..4ebabb7 100755 --- a/examples/wxTerminal.py +++ b/examples/wxTerminal.py @@ -138,7 +138,7 @@ class TerminalFrame(wx.Frame): # begin wxGlade: TerminalFrame.__init__ kwds["style"] = wx.DEFAULT_FRAME_STYLE wx.Frame.__init__(self, *args, **kwds) - + # Menu Bar self.frame_terminal_menubar = wx.MenuBar() wxglade_tmp_menu = wx.Menu() @@ -347,7 +347,6 @@ class TerminalFrame(wx.Frame): b = b.replace(b'\r\n', b'\n') event = SerialRxEvent(self.GetId(), b) self.GetEventHandler().AddPendingEvent(event) - #~ self.OnSerialRead(text) # output text in window def OnRTS(self, event): # wxGlade: TerminalFrame.<event_handler> self.serial.rts = event.IsChecked() |