Merge pull request #95 from rianhunter/master

Make create_connection() signature match socket module

Author: Anorov

socks.py

@@ -203,10 +203,11 @@ def wrap_module(module):
 wrapmodule = wrap_module
 
 
-def create_connection(dest_pair, proxy_type=None, proxy_addr=None,
+def create_connection(dest_pair,
+                      timeout=None, source_address=None,
+                      proxy_type=None, proxy_addr=None,
                       proxy_port=None, proxy_rdns=True,
                       proxy_username=None, proxy_password=None,
-                      timeout=None, source_address=None,
                       socket_options=None):
     """create_connection(dest_pair, *[, timeout], **proxy_args) -> socket object