diff options
| author | Nate Prewitt <Nate.Prewitt@gmail.com> | 2018-04-07 15:11:00 -0700 |
|---|---|---|
| committer | Nate Prewitt <Nate.Prewitt@gmail.com> | 2018-04-07 15:11:00 -0700 |
| commit | c7cea32304c05ef5890bcb8941edc8b6fbe04a03 (patch) | |
| tree | 7a5d670da7f5b7a8403537f2099435ce2407194e /requests/help.py | |
| parent | 9c6bd54b44c0b05c6907522e8d9998a87b69c1cd (diff) | |
| parent | b66908e7b647689793e299edc111bf9910e93ad3 (diff) | |
| download | python-requests-updating_3.0.0.tar.gz | |
Merge remote-tracking branch 'upstream/master' into updating_3.0.0updating_3.0.0
Diffstat (limited to 'requests/help.py')
| -rw-r--r-- | requests/help.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/requests/help.py b/requests/help.py index 5440ee61..06e06b2a 100644 --- a/requests/help.py +++ b/requests/help.py @@ -13,7 +13,7 @@ import chardet from . import __version__ as requests_version try: - from .packages.urllib3.contrib import pyopenssl + from urllib3.contrib import pyopenssl except ImportError: pyopenssl = None OpenSSL = None |