Changeset 276 for etherws

Timestamp:

02/07/15 19:18:51 (11 years ago)

Author:

atzm

Message:

fix a listport bug on tornado 4.0.x

Location:

etherws/trunk

Files:

• LICENSE (modified) (1 diff)
• README.rst (modified) (1 diff)
• etherws.py (modified) (2 diffs)
• setup.py (modified) (2 diffs)

etherws/trunk/LICENSE

@@ -1 @@
-Copyright (c) 2012-2014, Atzm WATANABE <atzm@atzm.org>
+Copyright (c) 2012-2015, Atzm WATANABE <atzm@atzm.org>
 All rights reserved.
 

etherws/trunk/README.rst

@@ -202 +202 @@
 History
 =======
+1.3
+  - fix listport bug on tornado 4.0.x
+
 1.2 (2014-12-29 JST)
   - verification of controller SSL certificate support

etherws/trunk/etherws.py

@@ -11 +11 @@
 #
 # ===========================================================================
-# Copyright (c) 2012-2014, Atzm WATANABE <atzm@atzm.org>
+# Copyright (c) 2012-2015, Atzm WATANABE <atzm@atzm.org>
 # All rights reserved.
 #
@@ -419 +419 @@
     @property
     def target(self):
-        return ':'.join(str(e) for e in self.request.connection.address)
+        conn = self.request.connection
+        if hasattr(conn, 'address'):
+            return ':'.join(str(e) for e in conn.address)
+        if hasattr(conn, 'context'):
+            return ':'.join(str(e) for e in conn.context.address)
+        return str(conn)
 
     def open(self):

etherws/trunk/setup.py

@@ -3 +3 @@
 #
 # ===========================================================================
-# Copyright (c) 2012-2014, Atzm WATANABE <atzm@atzm.org>
+# Copyright (c) 2012-2015, Atzm WATANABE <atzm@atzm.org>
 # All rights reserved.
 #
@@ -37 +37 @@
 setup(
     name='etherws',
-    version='1.2',
+    version='1.3',
     description='Ethernet over WebSocket',
     long_description=longdesc,