socks module is bundled with httplib2 v0.7.

As unfortunate as bundling may be, we may as well take advantage of it.

Author: JNRowe

doc/api/client.rst

@@ -42,9 +42,7 @@ API calls are limited by github.com to 1 per second by default.  To have the
     >>> github = Github(username="ask", api_token=".......",
     ...                 requests_per_second=1)
 
-If you wish to use the library with a HTTP proxy, you will require a Python
-SOCKS module installed.  :pypi:`SocksiPy-branch` is the module we test with, but
-various forks are available.  Pass in the ``proxy_host`` and optionally
+If you wish to use a HTTP proxy you can pass in the ``proxy_host`` and
 ``proxy_port`` settings to enable it.  The default for ``proxy_port``, if not
 given, is 8080::
 

doc/install.rst

@@ -25,7 +25,6 @@ for handling HTTP sessions.  :pypi:`python-dateutil` is used for its date
 handling [#]_.  :pypi:`simplejson` is also required when using :mod:`github2`
 with Python 2.4 or 2.5.  If you install via :pypi:`pip` or :pypi:`easy_install
 <setuptools>` the dependencies should be installed automatically for you.
-:pypi:`SocksiPy-branch` is an optional dependency if proxy support is needed.
 
 .. [#] You must use :pypi:`python-dateutil` 1.x when working with Python 2.x,
        the latest 2.x releases are for Python 3.x installations only.

github2/request.py

@@ -7,10 +7,6 @@
     import json as simplejson  # For Python 2.6
 except ImportError:
     import simplejson
-try:
-    import socks  # SOCKS support may not be installed
-except ImportError:
-    socks = None
 from os import path
 from urlparse import (urlsplit, urlunsplit)
 try:
@@ -78,11 +74,8 @@ def __init__(self, username=None, api_token=None, url_prefix=None,
                                      "DigiCert_High_Assurance_EV_Root_CA.crt")
         if proxy_host is None:
             self._http = httplib2.Http(cache=cache, ca_certs=digicert_ha_cert)
-        elif proxy_host and socks is None:
-            raise GithubError('Proxy support missing.  '
-                              'Install a Python SOCKS library.')
         else:
-            proxy_info = httplib2.ProxyInfo(socks.PROXY_TYPE_HTTP,
+            proxy_info = httplib2.ProxyInfo(httplib2.socks.PROXY_TYPE_HTTP,
                                             proxy_host, proxy_port)
             self._http = httplib2.Http(proxy_info=proxy_info, cache=cache,
                                        ca_certs=digicert_ha_cert)

setup.py

@@ -47,9 +47,6 @@
     zip_safe=True,
     test_suite="nose.collector",
     tests_require=['nose'],
-    extras_require={
-        'SOCKS': ['SocksiPy-branch==1.01'],
-    },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",

tox.ini

@@ -6,9 +6,6 @@ envlist = py24, py25, py26, py27, py31, py32, rst, sphinx
 deps =
     nose
     coverage
-
-    # Optional dep, but required for tests
-    SocksiPy-branch
 commands =
     rm -rf build
     {envpython} setup.py build