Merged last Python 2.2 bugfix.

7b380f43 · Brian Lloyd · 12a6412a · 7b380f43 · 7b380f43
Commit 7b380f43 authored Dec 14, 2001 by Brian Lloyd
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

ZServer/medusa/asyncore.py ZServer/medusa/asyncore.py +7 -1

lib/python/ZServer/medusa/asyncore.py lib/python/ZServer/medusa/asyncore.py +7 -1

No files found.
--- a/ZServer/medusa/asyncore.py
+++ b/ZServer/medusa/asyncore.py
@@ -212,7 +212,13 @@ class dispatcher:
            # I think it should inherit this anyway
            self.socket.setblocking (0)
            self.connected = 1
-            self.addr = sock.getpeername()
+            # XXX Does the constructor require that the socket passed
+            # be connected?
+            try:
+                self.addr = sock.getpeername()
+            except socket.error:
+                # The addr isn't crucial
+                pass
        else:
            self.socket = None


--- a/lib/python/ZServer/medusa/asyncore.py
+++ b/lib/python/ZServer/medusa/asyncore.py
@@ -212,7 +212,13 @@ class dispatcher:
            # I think it should inherit this anyway
            self.socket.setblocking (0)
            self.connected = 1
-            self.addr = sock.getpeername()
+            # XXX Does the constructor require that the socket passed
+            # be connected?
+            try:
+                self.addr = sock.getpeername()
+            except socket.error:
+                # The addr isn't crucial
+                pass
        else:
            self.socket = None