diff options
author | Francesco Fiorentino <f.fiorentino@camlintechnologies.com> | 2015-07-17 17:20:09 +0100 |
---|---|---|
committer | Francesco Fiorentino <f.fiorentino@camlintechnologies.com> | 2015-07-21 11:52:15 +0100 |
commit | 04a93901d6e9138a0b68b6ea799eeffbc3c5eed7 (patch) | |
tree | 79d3dc4b5b2baac385b46d748f14561d996a1111 /bin | |
parent | adb8b1ed1ee9b604e24e0a00f41b7f37604f9bf6 (diff) | |
download | tftpy-04a93901d6e9138a0b68b6ea799eeffbc3c5eed7.tar.gz |
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
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/tftpy_client.py | 4 | ||||
-rwxr-xr-x | bin/tftpy_server.py | 3 |
2 files changed, 5 insertions, 2 deletions
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: |