diff --git a/shotgun_api3/lib/httplib2/README.md b/shotgun_api3/lib/httplib2/README.md new file mode 100644 index 000000000..0a93f3d71 --- /dev/null +++ b/shotgun_api3/lib/httplib2/README.md @@ -0,0 +1,5 @@ +Currently this library is pulled from a fork of httplib2 (https://github.com/shotgunsoftware/httplib2) + +The reason for the fork is to make a minor fix to the imports that was causing IronPython2.7 ImportErrors. + +The fix has been submitted to httplib2 repo and already merged so this will likely not be necessary as soon as httplib2 is next released. (>v0.17.2) \ No newline at end of file diff --git a/shotgun_api3/lib/httplib2/python2/__init__.py b/shotgun_api3/lib/httplib2/python2/__init__.py index b3cc0b2fb..6f023417b 100644 --- a/shotgun_api3/lib/httplib2/python2/__init__.py +++ b/shotgun_api3/lib/httplib2/python2/__init__.py @@ -122,7 +122,7 @@ def _ssl_wrap_socket_unsupported( _ssl_wrap_socket = _ssl_wrap_socket_unsupported if sys.version_info >= (2, 3): - from iri2uri import iri2uri + from .iri2uri import iri2uri else: def iri2uri(uri):