From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 17 Aug 2013 19:07:10 +0000 (-0500)
Subject: web-cmd.py: accommodate HTTPServer s/_socket/_sockets/ in newer versions.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8c78bbb6804f4d52bd65f60c024fced1bdb1fed3;p=packages%2Fb%2Fbup.git

web-cmd.py: accommodate HTTPServer s/_socket/_sockets/ in newer versions.

Newer versions of tornado changed HTTPServer._socket to
HTTPServer._sockets, with slightly different semantics.  Handle both.

Thanks to Andy Somerville <andy.somerville@gmail.com> for reporting
the problem and proposing an initial patch.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/cmd/web-cmd.py b/cmd/web-cmd.py
index 37a423f..c930f38 100755
--- a/cmd/web-cmd.py
+++ b/cmd/web-cmd.py
@@ -215,7 +215,12 @@ if __name__ == "__main__":
     http_server = tornado.httpserver.HTTPServer(application)
     http_server.listen(address[1], address=address[0])
 
-    print "Serving HTTP on %s:%d..." % http_server._socket.getsockname()
+    try:
+        sock = http_server._socket # tornado < 2.0
+    except AttributeError, e:
+        sock = http_server._sockets.values()[0]
+
+    print "Serving HTTP on %s:%d..." % sock.getsockname()
     loop = tornado.ioloop.IOLoop.instance()
     loop.start()