aboutsummaryrefslogtreecommitdiff
path: root/urllib3/fields.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerDaniele Tricoli <eriol@mornie.org>2015-10-09 23:15:23 +0200
commit3a7deaa269ec9e1dc5dfb860e29b053475647cf5 (patch)
tree714a980c082261a5f041968458b0aad462a4a726 /urllib3/fields.py
parent2b3d330a120a16e97cecd5163b5d454dcfe38a2b (diff)
downloadpython-urllib3-3a7deaa269ec9e1dc5dfb860e29b053475647cf5.tar
python-urllib3-3a7deaa269ec9e1dc5dfb860e29b053475647cf5.tar.gz
Do not use embedded copy of python-six.
Forwarded: not-needed Last-Update: 2015-05-03 Patch-Name: 01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'urllib3/fields.py')
-rw-r--r--urllib3/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/urllib3/fields.py b/urllib3/fields.py
index c853f8d..5fe3c24 100644
--- a/urllib3/fields.py
+++ b/urllib3/fields.py
@@ -1,7 +1,7 @@
import email.utils
import mimetypes
-from .packages import six
+import six
def guess_content_type(filename, default='application/octet-stream'):