diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-02 07:55:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-02 07:55:23 +0000 |
| commit | 4f320bd0345e8790a634f5713b1ed77ae3271c54 (patch) | |
| tree | 29e5e208780de551fd40b41ab3ae46fb160f5899 /swiftclient | |
| parent | 78753987468cb6b04d0b4e06b432e22f5a7189bd (diff) | |
| parent | 7175069b3e95c38070bb4373019f78c87ab103d0 (diff) | |
| download | python-swiftclient-4f320bd0345e8790a634f5713b1ed77ae3271c54.tar.gz | |
Merge "Fix up requests so we can send non-RFC-compliant headers on py3"
Diffstat (limited to 'swiftclient')
| -rw-r--r-- | swiftclient/client.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index f071182..4be2e2d 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -74,8 +74,10 @@ except ImportError: pass # requests version 1.2.3 try to encode headers in ascii, preventing -# utf-8 encoded header to be 'prepared' -if StrictVersion(requests.__version__) < StrictVersion('2.0.0'): +# utf-8 encoded header to be 'prepared'. This also affects all +# (or at least most) versions of requests on py3 +if StrictVersion(requests.__version__) < StrictVersion('2.0.0') \ + or not six.PY2: from requests.structures import CaseInsensitiveDict def prepare_unicode_headers(self, headers): |