Add python-eventlet package to MOS 8.0 repository

[packages/trusty/python-eventlet.git] / python-eventlet / eventlet / green / socket.py

diff --git a/eventlet/eventlet/green/socket.py b/python-eventlet/eventlet/green/socket.py
similarity index 92%
rename from eventlet/eventlet/green/socket.py
rename to python-eventlet/eventlet/green/socket.py
index 2ec9d1b244fe57c5aeb1fe3b5dedd2d18e0f5103..e8ef03251e7f9a5c3a4e766bf21681fcb4367bf3 100644 (file)
--- a/eventlet/eventlet/green/socket.py
+++ b/python-eventlet/eventlet/green/socket.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from eventlet.hubs import get_hub
+
 __import__('eventlet.green._socket_nodns')
 __socket = sys.modules['eventlet.green._socket_nodns']
 
@@ -39,7 +39,7 @@ def create_connection(address,
     is used.
     """
 
-    msg = "getaddrinfo returns an empty list"
+    err = "getaddrinfo returns an empty list"
     host, port = address
     for res in getaddrinfo(host, port, 0, SOCK_STREAM):
         af, socktype, proto, canonname, sa = res
@@ -54,8 +54,10 @@ def create_connection(address,
             return sock
 
         except error as e:
-            msg = e
+            err = e
             if sock is not None:
                 sock.close()
 
-    raise error(msg)
+    if not isinstance(err, error):
+        err = error(err)
+    raise err