Improvements to *_app._getConnection methods suggested by

Andrej A Antonov. Thanks!

3 files changed, 17 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a181fd7..2395254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-05  Allan Saddi  <allan@saddi.com>
+
+	* Improvements to *_app._getConnection methods suggested by
+	  Andrej A Antonov. Thanks!
+
 2009-10-27  Allan Saddi  <allan@saddi.com>
 
 	* Exit gracefully if a thread cannot be started when adding a new
diff --git a/flup/client/fcgi_app.py b/flup/client/fcgi_app.py
index c1c15ec..f4dc9bb 100644
--- a/flup/client/fcgi_app.py
+++ b/flup/client/fcgi_app.py
@@ -31,6 +31,7 @@ import select
 import struct
 import socket
 import errno
+import types
 
 __all__ = ['FCGIApp']
 
@@ -386,11 +387,14 @@ class FCGIApp(object):
         if self._connect is not None:
             # The simple case. Create a socket and connect to the
             # application.
-            if type(self._connect) is str:
+            if isinstance(self._connect, types.StringTypes):
                 sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+                sock.connect(self._connect)
+            elif hasattr(socket, 'create_connection'):
+                sock = socket.create_connection(self._connect)
             else:
                 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.connect(self._connect)
+                sock.connect(self._connect)
             return sock
 
         # To be done when I have more time...
diff --git a/flup/client/scgi_app.py b/flup/client/scgi_app.py
index c26cd58..b2f01f1 100644
--- a/flup/client/scgi_app.py
+++ b/flup/client/scgi_app.py
@@ -31,6 +31,7 @@ import select
 import struct
 import socket
 import errno
+import types
 
 __all__ = ['SCGIApp']
 
@@ -136,11 +137,14 @@ class SCGIApp(object):
         return [result]
 
     def _getConnection(self):
-        if type(self._connect) is str:
+        if isinstance(self._connect, types.StringTypes):
             sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            sock.connect(self._connect)
+        elif hasattr(socket, 'create_connection'):
+            sock = socket.create_connection(self._connect)
         else:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.connect(self._connect)
+            sock.connect(self._connect)
         return sock
     
     _environPrefixes = ['SERVER_', 'HTTP_', 'REQUEST_', 'REMOTE_', 'PATH_',