Line 0
Link Here
|
|
|
1 |
--- setup.py.orig 2012-01-23 06:48:28.000000000 +0000 |
2 |
+++ setup.py 2012-02-07 16:11:32.000000000 +0000 |
3 |
@@ -4,10 +4,9 @@ |
4 |
import os |
5 |
import sys |
6 |
import requests |
7 |
-from requests.compat import is_py3 |
8 |
|
9 |
try: |
10 |
- from setuptools import setup |
11 |
+ from setuptools import setup, find_packages |
12 |
except ImportError: |
13 |
from distutils.core import setup |
14 |
|
15 |
@@ -21,12 +20,8 @@ |
16 |
os.system('python test_requests.py') |
17 |
sys.exit() |
18 |
|
19 |
-required = ['certifi>=0.0.7',] |
20 |
- |
21 |
-if is_py3: |
22 |
- required.append('chardet2') |
23 |
-else: |
24 |
- required.append('chardet>=1.0.0') |
25 |
+# FreeBSD ports tree, provides only chardet2 |
26 |
+required = ['certifi>=0.0.7', 'chardet2>=1.0.0'] |
27 |
|
28 |
|
29 |
setup( |
30 |
@@ -38,15 +33,7 @@ |
31 |
author='Kenneth Reitz', |
32 |
author_email='me@kennethreitz.com', |
33 |
url='http://python-requests.org', |
34 |
- packages=[ |
35 |
- 'requests', |
36 |
- 'requests.packages', |
37 |
- 'requests.packages.urllib3', |
38 |
- 'requests.packages.urllib3.packages', |
39 |
- 'requests.packages.urllib3.packages.ssl_match_hostname', |
40 |
- 'requests.packages.urllib3.packages.mimetools_choose_boundary', |
41 |
- 'requests.packages.oreos' |
42 |
- ], |
43 |
+ packages=find_packages(where='.', exclude=['requests.packages.url*']), |
44 |
package_data={'': ['LICENSE', 'NOTICE']}, |
45 |
include_package_data=True, |
46 |
install_requires=required, |