aboutsummaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-23 16:09:18 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-23 16:09:18 +0200
commit86eb67cfced6246d99f6aa059ea01af560df337e (patch)
tree91575727e1df41beb649d0db2a4bc8b14f03cbf1 /setup.py
parentd3161bbeef0171a98941287e8d276c451b4be401 (diff)
parent6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 (diff)
downloadpython-requests-86eb67cfced6246d99f6aa059ea01af560df337e.tar
python-requests-86eb67cfced6246d99f6aa059ea01af560df337e.tar.gz
merge patched into master
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index eb444f1..6f62b80 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,9 @@ packages = [
'requests.packages.urllib3.packages.ssl_match_hostname',
]
-requires = []
+requires = [
+ 'urllib3==1.12',
+]
version = ''
with open('requests/__init__.py', 'r') as fd: