Merge pull request #107 from hugovk/update-versions

Update supported Python versions

Author: Anorov

README.md

@@ -15,7 +15,7 @@ I no longer have the time to actively work on this project. I will gladly accept
 Features
 ========
 
-* SOCKS proxy client for Python 2.6 - 3.x
+* SOCKS proxy client for Python 2.7 and 3.4+
 * TCP and UDP both supported
 * HTTP proxy client included but not supported or recommended (you should use urllib2's or requests' own HTTP proxy interface)
 * urllib2 handler included. `pip install` / `setup.py install` will automatically install the `sockshandler` module.

setup.py

@@ -21,9 +21,13 @@
     keywords = ["socks", "proxy"],
     py_modules=["socks", "sockshandler"],
     install_requires=requirements,
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=(
-        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     )
 )

socks.py

@@ -117,7 +117,7 @@ def __init__(self, msg, socket_err=None):
         self.socket_err = socket_err
 
         if socket_err:
-            self.msg += ": {0}".format(socket_err)
+            self.msg += ": {}".format(socket_err)
 
     def __str__(self):
         return self.msg
@@ -586,7 +586,7 @@ def _SOCKS5_request(self, conn, cmd, dst):
             if status != 0x00:
                 # Connection failed: server returned an error
                 error = SOCKS5_ERRORS.get(status, "Unknown error")
-                raise SOCKS5Error("{0:#04x}: {1}".format(status, error))
+                raise SOCKS5Error("{:#04x}: {}".format(status, error))
 
             # Get the bound address/port
             bnd = self._read_SOCKS5_address(reader)
@@ -704,7 +704,7 @@ def _negotiate_SOCKS4(self, dest_addr, dest_port):
             if status != 0x5A:
                 # Connection failed: server returned an error
                 error = SOCKS4_ERRORS.get(status, "Unknown error")
-                raise SOCKS4Error("{0:#04x}: {1}".format(status, error))
+                raise SOCKS4Error("{:#04x}: {}".format(status, error))
 
             # Get the bound address/port
             self.proxy_sockname = (socket.inet_ntoa(resp[4:]),
@@ -764,7 +764,7 @@ def _negotiate_HTTP(self, dest_addr, dest_port):
                 "HTTP proxy server did not return a valid HTTP status")
 
         if status_code != 200:
-            error = "{0}: {1}".format(status_code, status_msg)
+            error = "{}: {}".format(status_code, status_msg)
             if status_code in (400, 403, 405):
                 # It's likely that the HTTP proxy server does not support the
                 # CONNECT tunneling method
@@ -847,10 +847,10 @@ def connect(self, dest_pair, catch_errors=None):
             self.close()
             if not catch_errors:
                 proxy_addr, proxy_port = proxy_addr
-                proxy_server = "{0}:{1}".format(proxy_addr, proxy_port)
+                proxy_server = "{}:{}".format(proxy_addr, proxy_port)
                 printable_type = PRINTABLE_PROXY_TYPES[proxy_type]
 
-                msg = "Error connecting to {0} proxy {1}".format(printable_type,
+                msg = "Error connecting to {} proxy {}".format(printable_type,
                                                                     proxy_server)
                 log.debug("%s due to: %s", msg, error)
                 raise ProxyConnectionError(msg, error)