diff options
| author | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:19 -0700 |
|---|---|---|
| committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:19 -0700 |
| commit | 365ef510aa3581a79709673e078401724601fc71 (patch) | |
| tree | 44b2c6aae568684e93eb598d7a2069c1867fdaaf /requests/packages/urllib3/request.py | |
| parent | 1c0a691ebf468d42b7c0d6b0e9daf0b2ff82cc20 (diff) | |
| download | python-requests-365ef510aa3581a79709673e078401724601fc71.tar python-requests-365ef510aa3581a79709673e078401724601fc71.tar.gz | |
Imported Upstream version 0.10.1
Diffstat (limited to 'requests/packages/urllib3/request.py')
| -rw-r--r-- | requests/packages/urllib3/request.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/requests/packages/urllib3/request.py b/requests/packages/urllib3/request.py index a7e0b5d..5ea26a0 100644 --- a/requests/packages/urllib3/request.py +++ b/requests/packages/urllib3/request.py @@ -1,11 +1,13 @@ # urllib3/request.py -# Copyright 2008-2011 Andrey Petrov and contributors (see CONTRIBUTORS.txt) +# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt) # # This module is part of urllib3 and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php - -from urllib import urlencode +try: + from urllib.parse import urlencode +except ImportError: + from urllib import urlencode from .filepost import encode_multipart_formdata |