Skip to content

Commit dcfcfba

Browse files
authored
SG-16899 httplib2 relative import (#225)
Made the iri2uri import a relative import
1 parent e63f83a commit dcfcfba

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Currently this library is pulled from a fork of httplib2 (https://github.com/shotgunsoftware/httplib2)
2+
3+
The reason for the fork is to make a minor fix to the imports that was causing IronPython2.7 ImportErrors.
4+
5+
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)

shotgun_api3/lib/httplib2/python2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def _ssl_wrap_socket_unsupported(
122122
_ssl_wrap_socket = _ssl_wrap_socket_unsupported
123123

124124
if sys.version_info >= (2, 3):
125-
from iri2uri import iri2uri
125+
from .iri2uri import iri2uri
126126
else:
127127

128128
def iri2uri(uri):

0 commit comments

Comments
 (0)