diff options
| author | Joe Gregorio <jcgregorio@google.com> | 2012-01-09 09:22:23 -0500 |
|---|---|---|
| committer | Joe Gregorio <jcgregorio@google.com> | 2012-01-09 09:22:23 -0500 |
| commit | 40e25c7eb9cc846773d4668c284e17245f8802c4 (patch) | |
| tree | 61ab37fbdf823aba6899f3c4d9b24cd6b55bf256 /python2 | |
| parent | 16f48c454ebe035c65274fc6bbf902f41f1ccec3 (diff) | |
| download | httplib2-40e25c7eb9cc846773d4668c284e17245f8802c4.tar.gz | |
Fall back to using installed socks.py if local one is not found.
Reviewed in http://codereview.appspot.com/5485050/
Diffstat (limited to 'python2')
| -rw-r--r-- | python2/httplib2/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py index e2d8517..7dfd38c 100644 --- a/python2/httplib2/__init__.py +++ b/python2/httplib2/__init__.py @@ -58,7 +58,10 @@ import socket try: from httplib2 import socks except ImportError: - socks = None + try: + import socks + except ImportError: + socks = None # Build the appropriate socket wrapper for ssl try: |