first attempt with github actions, various linting

2 files changed, 151 insertions, 100 deletions

diff --git a/bin/tftpy_client.py b/bin/tftpy_client.py
index 12f38f7..b8debe2 100755
--- a/bin/tftpy_client.py
+++ b/bin/tftpy_client.py
@@ -2,82 +2,108 @@
 # vim: ts=4 sw=4 et ai:
 # -*- coding: utf8 -*-
 
-import sys, logging, os
+import logging
+import os
+import sys
 from optparse import OptionParser
+
 import tftpy
 
-log = logging.getLogger('tftpy')
+log = logging.getLogger("tftpy")
 log.setLevel(logging.INFO)
 
 # console handler
 handler = logging.StreamHandler()
 handler.setLevel(logging.DEBUG)
-default_formatter = logging.Formatter('[%(asctime)s] %(message)s')
+default_formatter = logging.Formatter("[%(asctime)s] %(message)s")
 handler.setFormatter(default_formatter)
 log.addHandler(handler)
 
+
 def main():
-    usage=""
+    usage = ""
     parser = OptionParser(usage=usage)
-    parser.add_option('-H',
-                      '--host',
-                      help='remote host or ip address')
-    parser.add_option('-p',
-                      '--port',
-                      help='remote port to use (default: 69)',
-                      default=69)
-    parser.add_option('-f',
-                      '--filename',
-                      help='filename to fetch (deprecated, use download)')
-    parser.add_option('-D',
-                      '--download',
-                      help='filename to download')
-    parser.add_option('-u',
-                      '--upload',
-                      help='filename to upload')
-    parser.add_option('-b',
-                      '--blksize',
-                      help='udp packet size to use (default: 512)')
-    parser.add_option('-o',
-                      '--output',
-                      help='output file, - for stdout (default: same as download)')
-    parser.add_option('-i',
-                      '--input',
-                      help='input file, - for stdin (default: same as upload)')
-    parser.add_option('-d',
-                      '--debug',
-                      action='store_true',
-                      default=False,
-                      help='upgrade logging from info to debug')
-    parser.add_option('-q',
-                      '--quiet',
-                      action='store_true',
-                      default=False,
-                      help="downgrade logging from info to warning")
-    parser.add_option('-t',
-                      '--tsize',
-                      action='store_true',
-                      default=False,
-                      help="ask client to send tsize option in download")
-    parser.add_option('-l',
-                      '--localip',
-                      action='store',
-                      dest='localip',
-                      default="",
-                      help='local IP for client to bind to (ie. interface)')
+    parser.add_option(
+        "-H",
+        "--host",
+        help="remote host or ip address",
+    )
+    parser.add_option(
+        "-p",
+        "--port",
+        help="remote port to use (default: 69)",
+        default=69,
+    )
+    parser.add_option(
+        "-f",
+        "--filename",
+        help="filename to fetch (deprecated, use download)",
+    )
+    parser.add_option(
+        "-D",
+        "--download",
+        help="filename to download",
+    )
+    parser.add_option(
+        "-u",
+        "--upload",
+        help="filename to upload",
+    )
+    parser.add_option(
+        "-b",
+        "--blksize",
+        help="udp packet size to use (default: 512)",
+    )
+    parser.add_option(
+        "-o",
+        "--output",
+        help="output file, - for stdout (default: same as download)",
+    )
+    parser.add_option(
+        "-i",
+        "--input",
+        help="input file, - for stdin (default: same as upload)",
+    )
+    parser.add_option(
+        "-d",
+        "--debug",
+        action="store_true",
+        default=False,
+        help="upgrade logging from info to debug",
+    )
+    parser.add_option(
+        "-q",
+        "--quiet",
+        action="store_true",
+        default=False,
+        help="downgrade logging from info to warning",
+    )
+    parser.add_option(
+        "-t",
+        "--tsize",
+        action="store_true",
+        default=False,
+        help="ask client to send tsize option in download",
+    )
+    parser.add_option(
+        "-l",
+        "--localip",
+        action="store",
+        dest="localip",
+        default="",
+        help="local IP for client to bind to (ie. interface)",
+    )
     options, args = parser.parse_args()
     # Handle legacy --filename argument.
     if options.filename:
         options.download = options.filename
     if not options.host or (not options.download and not options.upload):
-        sys.stderr.write("Both the --host and --filename options "
-                         "are required.\n")
+        sys.stderr.write("Both the --host and --filename options are required.\n")
         parser.print_help()
         sys.exit(1)
 
     if options.debug and options.quiet:
-        sys.stderr.write("The --debug and --quiet options are "
-                         "mutually exclusive.\n")
+        sys.stderr.write("The --debug and --quiet options are mutually exclusive.\n")
         parser.print_help()
         sys.exit(1)
 
@@ -92,11 +118,13 @@ def main():
                 self.out("Transferred %d bytes" % self.progress)
             elif isinstance(pkt, tftpy.TftpPacketTypes.TftpPacketOACK):
                 self.out("Received OACK, options are: %s" % pkt.options)
-        
+
     if options.debug:
         log.setLevel(logging.DEBUG)
         # increase the verbosity of the formatter
-        debug_formatter = logging.Formatter('[%(asctime)s%(msecs)03d] %(levelname)s [%(name)s:%(lineno)s] %(message)s')
+        debug_formatter = logging.Formatter(
+            "[%(asctime)s%(msecs)03d] %(levelname)s [%(name)s:%(lineno)s] %(message)s"
+        )
         handler.setFormatter(debug_formatter)
     elif options.quiet:
         log.setLevel(logging.WARNING)
@@ -105,32 +133,39 @@ def main():
 
     tftp_options = {}
     if options.blksize:
-        tftp_options['blksize'] = int(options.blksize)
+        tftp_options["blksize"] = int(options.blksize)
     if options.tsize:
-        tftp_options['tsize'] = 0
+        tftp_options["tsize"] = 0
 
-    tclient = tftpy.TftpClient(options.host,
-                               int(options.port),
-                               tftp_options,
-                               options.localip)
+    tclient = tftpy.TftpClient(
+        options.host,
+        int(options.port),
+        tftp_options,
+        options.localip,
+    )
     try:
         if options.download:
             if not options.output:
                 options.output = os.path.basename(options.download)
-            tclient.download(options.download,
-                             options.output,
-                             progresshook)
+            tclient.download(
+                options.download,
+                options.output,
+                progresshook,
+            )
         elif options.upload:
             if not options.input:
                 options.input = os.path.basename(options.upload)
-            tclient.upload(options.upload,
-                           options.input,
-                           progresshook)
+            tclient.upload(
+                options.upload,
+                options.input,
+                progresshook,
+            )
     except tftpy.TftpException as err:
         sys.stderr.write("%s\n" % str(err))
         sys.exit(1)
     except KeyboardInterrupt:
         pass
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()
diff --git a/bin/tftpy_server.py b/bin/tftpy_server.py
index a713563..64c86fa 100755
--- a/bin/tftpy_server.py
+++ b/bin/tftpy_server.py
@@ -2,54 +2,69 @@
 # vim: ts=4 sw=4 et ai:
 # -*- coding: utf8 -*-
 
-import sys, logging
+import logging
+import sys
 from optparse import OptionParser
+
 import tftpy
 
-log = logging.getLogger('tftpy')
+log = logging.getLogger("tftpy")
 log.setLevel(logging.INFO)
 
 # console handler
 handler = logging.StreamHandler()
 handler.setLevel(logging.DEBUG)
-default_formatter = logging.Formatter('[%(asctime)s] %(message)s')
+default_formatter = logging.Formatter("[%(asctime)s] %(message)s")
 handler.setFormatter(default_formatter)
 log.addHandler(handler)
 
+
 def main():
-    usage=""
+    usage = ""
     parser = OptionParser(usage=usage)
-    parser.add_option('-i',
-                      '--ip',
-                      type='string',
-                      help='ip address to bind to (default: INADDR_ANY)',
-                      default="")
-    parser.add_option('-p',
-                      '--port',
-                      type='int',
-                      help='local port to use (default: 69)',
-                      default=69)
-    parser.add_option('-r',
-                      '--root',
-                      type='string',
-                      help='path to serve from',
-                      default=None)
-    parser.add_option('-q',
-                      '--quiet',
-                      action='store_true',
-                      default=False,
-                      help="Do not log unless it is critical")
-    parser.add_option('-d',
-                      '--debug',
-                      action='store_true',
-                      default=False,
-                      help='upgrade logging from info to debug')
+    parser.add_option(
+        "-i",
+        "--ip",
+        type="string",
+        help="ip address to bind to (default: INADDR_ANY)",
+        default="",
+    )
+    parser.add_option(
+        "-p",
+        "--port",
+        type="int",
+        help="local port to use (default: 69)",
+        default=69,
+    )
+    parser.add_option(
+        "-r",
+        "--root",
+        type="string",
+        help="path to serve from",
+        default=None,
+    )
+    parser.add_option(
+        "-q",
+        "--quiet",
+        action="store_true",
+        default=False,
+        help="Do not log unless it is critical",
+    )
+    parser.add_option(
+        "-d",
+        "--debug",
+        action="store_true",
+        default=False,
+        help="upgrade logging from info to debug",
+    )
     options, args = parser.parse_args()
 
     if options.debug:
         log.setLevel(logging.DEBUG)
         # increase the verbosity of the formatter
-        debug_formatter = logging.Formatter('[%(asctime)s%(msecs)03d] %(levelname)s [%(name)s:%(lineno)s] %(message)s')
+        debug_formatter = logging.Formatter(
+            "[%(asctime)s%(msecs)03d] %(levelname)s [%(name)s:%(lineno)s] %(message)s"
+        )
         handler.setFormatter(debug_formatter)
     elif options.quiet:
         log.setLevel(logging.WARN)
@@ -67,5 +82,6 @@ def main():
     except KeyboardInterrupt:
         pass
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()