From 04a93901d6e9138a0b68b6ea799eeffbc3c5eed7 Mon Sep 17 00:00:00 2001 From: Francesco Fiorentino Date: Fri, 17 Jul 2015 17:20:09 +0100 Subject: Release version 0.6.3_fork (forked version) Contains: Bug fixes in log.debug Fixes in broken code Fixes many PEP8 issues Created testWin Unit for Win environment --- bin/tftpy_client.py | 4 +++- bin/tftpy_server.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/tftpy_client.py b/bin/tftpy_client.py index 1a50b56..9eacd0d 100755 --- a/bin/tftpy_client.py +++ b/bin/tftpy_client.py @@ -4,6 +4,7 @@ import sys, logging, os from optparse import OptionParser import tftpy + def main(): usage="" parser = OptionParser(usage=usage) @@ -67,6 +68,7 @@ def main(): def __init__(self, out): self.progress = 0 self.out = out + def progresshook(self, pkt): if isinstance(pkt, tftpy.TftpPacketDAT): self.progress += len(pkt.data) @@ -105,7 +107,7 @@ def main(): tclient.upload(options.upload, options.input, progresshook) - except tftpy.TftpException, err: + except tftpy.TftpException as err: sys.stderr.write("%s\n" % str(err)) sys.exit(1) except KeyboardInterrupt: diff --git a/bin/tftpy_server.py b/bin/tftpy_server.py index 6a1d3a3..8c81def 100755 --- a/bin/tftpy_server.py +++ b/bin/tftpy_server.py @@ -4,6 +4,7 @@ import sys, logging from optparse import OptionParser import tftpy + def main(): usage="" parser = OptionParser(usage=usage) @@ -41,7 +42,7 @@ def main(): server = tftpy.TftpServer(options.root) try: server.listen(options.ip, options.port) - except tftpy.TftpException, err: + except tftpy.TftpException as err: sys.stderr.write("%s\n" % str(err)) sys.exit(1) except KeyboardInterrupt: -- cgit v1.2.1