From 90fb22ec47f49e489649312a3d0021bf2f69fc99 Mon Sep 17 00:00:00 2001 From: James Pulec Date: Tue, 16 Jul 2013 15:09:55 -0500 Subject: [PATCH] Get rid of stupid broken creole shit. Fix for Python3 compatibility. --- ping.py | 6 +++--- setup.py | 24 ++++-------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/ping.py b/ping.py index 5b0f105..d0ac5b3 100755 --- a/ping.py +++ b/ping.py @@ -344,7 +344,7 @@ def __init__(self, destination, timeout=3000, packet_size=64, own_id=None, quiet self.stats.destination_ip = info[4][0] else: self.stats.destination_ip = socket.gethostbyname(self.stats.destination_host) - except socket.error, e: + except socket.error as e: self._stderr.write("\nPYTHON PING: Unknown host: %s (%s)\n" % (self.stats.destination_host, e.args[1])) #sys.exit(2) self.unknown_host = True @@ -366,7 +366,7 @@ def do_one(self): current_socket = socket.socket(socket.AF_INET6, socket.SOCK_RAW, socket.getprotobyname("ipv6-icmp")) else: current_socket = socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.getprotobyname("icmp")) - except socket.error, e: + except socket.error as e: # if e.args[0] == 1: # # Operation not permitted - Add more information to traceback # etype, evalue, etb = sys.exc_info() @@ -486,7 +486,7 @@ def send_one_ping(self, current_socket): current_socket.sendto(packet, (self.stats.destination_ip, self.stats.destination_port, 0, 0)) else: current_socket.sendto(packet, (self.stats.destination_ip, self.stats.destination_port)) - except socket.error, e: + except socket.error as e: self._stderr.write("General failure (%s)\n" % (e.args[1])) send_time = None diff --git a/setup.py b/setup.py index a5ecc8c..1642bda 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def get_version_from_git(): shell=False, cwd=PACKAGE_ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, ) - except Exception, err: + except Exception as err: return _error("Can't get git hash: %s" % err) process.wait() @@ -54,31 +54,16 @@ def get_version_from_git(): try: raw_timestamp, hash = output.split("-", 1) timestamp = int(raw_timestamp) - except Exception, err: + except Exception as err: return _error("Error in git log output! Output was: %r" % output) try: timestamp_formatted = time.strftime("%Y.%m.%d", time.gmtime(timestamp)) - except Exception, err: + except Exception as err: return _error("can't convert %r to time string: %s" % (timestamp, err)) return "%s.%s" % (timestamp_formatted, hash) - -# convert creole to ReSt on-the-fly, see also: -# https://code.google.com/p/python-creole/wiki/UseInSetup -try: - from creole.setup_utils import get_long_description -except ImportError: - if "register" in sys.argv or "sdist" in sys.argv or "--long-description" in sys.argv: - etype, evalue, etb = sys.exc_info() - evalue = etype("%s - Please install python-creole >= v0.8 - e.g.: pip install python-creole" % evalue) - raise etype, evalue, etb - long_description = None -else: - long_description = get_long_description(PACKAGE_ROOT) - - def get_authors(): authors = [] try: @@ -91,7 +76,7 @@ def get_authors(): authors.append(line.strip(" *\r\n")) f.close() authors.sort() - except Exception, err: + except Exception as err: authors = "[Error: %s]" % err return authors @@ -100,7 +85,6 @@ def get_authors(): name='python-ping', version=get_version_from_git(), description='A pure python ICMP ping implementation using raw sockets.', - long_description=long_description, author=get_authors(), maintainer="Jens Diemer", maintainer_email="python-ping@jensdiemer.de",