summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorAndrey Petrov <andrey.petrov@shazow.net>2012-01-22 16:01:48 -0800
committerAndrey Petrov <andrey.petrov@shazow.net>2012-01-22 16:01:48 -0800
commit3cc735dac8f3c722ef85d764d64de078ba755758 (patch)
treedfa0b9722bf7df7c7fe20b6d1c3163ab96926ac7 /setup.py
parent7a85442a3cc5dc96f1a7e3132559624d3bf56ab5 (diff)
parent06d5019254e99b71d526621876f9562b0a807359 (diff)
downloadurllib3-3cc735dac8f3c722ef85d764d64de078ba755758.tar.gz
Merging and getting rid of eventlet, wsgiref and other things in dummyserver. Lots of sexy refactoring.
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/setup.py b/setup.py
index b65c6d19..f7d5f27e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,11 +4,11 @@ from distutils.core import setup
import os
import re
-
+import sys
try:
import setuptools
-except ImportError, _:
+except ImportError:
pass # No 'develop' command, oh well.
base_path = os.path.dirname(__file__)
@@ -25,10 +25,14 @@ version = VERSION
requirements = []
tests_requirements = requirements + [
'coverage',
- 'eventlet',
+ 'tornado',
'nose',
'webob',
]
+if sys.version_info[0] >= 3:
+ tests_requirements.append('tornado')
+else:
+ tests_requirements.append('eventlet')
setup(name='urllib3',
version=version,
@@ -48,7 +52,9 @@ setup(name='urllib3',
author_email='andrey.petrov@shazow.net',
url='http://urllib3.readthedocs.org/',
license='MIT',
- packages=['urllib3', 'dummyserver', 'urllib3.packages', 'urllib3.packages.ssl_match_hostname'],
+ packages=['urllib3', 'dummyserver', 'urllib3.packages',
+ 'urllib3.packages.ssl_match_hostname', 'urllib3.packages.mimetools_choose_boundary',
+ ],
requires=requirements,
tests_require=tests_requirements,
test_suite='test',