From 6981f82b7b8d4bb47c6c101df49c295a90173b38 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 14 May 2014 17:45:06 -0600 Subject: [PATCH] Bump version to alpha4. --- gns3server/modules/iou/ioucon.py | 5 ++++- gns3server/version.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gns3server/modules/iou/ioucon.py b/gns3server/modules/iou/ioucon.py index 138b61e7..77ed0fd9 100644 --- a/gns3server/modules/iou/ioucon.py +++ b/gns3server/modules/iou/ioucon.py @@ -334,7 +334,10 @@ class TelnetServer(Console): def _disconnect(self, fileno): fd = self.fd_dict.pop(fileno) log.info("Telnet client disconnected") - fd.shutdown(socket.SHUT_RDWR) + try: + fd.shutdown(socket.SHUT_RDWR) + except OSError as e: + log.warn("shutdown: {}".format(e)) fd.close() def __enter__(self): diff --git a/gns3server/version.py b/gns3server/version.py index 2799ab28..09dc36bb 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.0a4.dev2" +__version__ = "1.0a4" __version_info__ = (1, 0, 0, -99) diff --git a/setup.py b/setup.py index 17532f33..ffba880a 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ setup( long_description=open("README.rst", "r").read(), install_requires=[ "tornado>=3.1", - "pyzmq>=13.1.0", # this is the strict minimum, recommended is >= 14.0.0 + "pyzmq>=14.0.0", "jsonschema==2.3.0" ], entry_points={