Skip to content

SG-16899 httplib2 relative import#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eshokrgozar merged 2 commits into from
Apr 21, 2020
Merged

SG-16899 httplib2 relative import #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
642b80c
Made the iri2uri import a relative import
eshokrgozar Apr 17, 2020
e0e0021
Added readme file
eshokrgozar Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions shotgun_api3/lib/httplib2/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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)
2 changes: 1 addition & 1 deletion shotgun_api3/lib/httplib2/python2/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down