View | Details | Raw Unified | Return to bug 168136
Collapse All | Expand All

(-)py-requests/Makefile (-1 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	requests
8
PORTNAME=	requests
9
PORTVERSION=	0.11.2
9
PORTVERSION=	0.12.1
10
CATEGORIES=	www python
10
CATEGORIES=	www python
11
MASTER_SITES=	CHEESESHOP
11
MASTER_SITES=	CHEESESHOP
12
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
12
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
(-)py-requests/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (requests-0.11.2.tar.gz) = 547bf78a774a6018271d6e5c40613ec554642ba4d6cdf45813e7894145293c57
1
SHA256 (requests-0.12.1.tar.gz) = 9ce56b87180c06728d96ca734055675abf8f5cc3136e0d7712a6260430685589
2
SIZE (requests-0.11.2.tar.gz) = 71080
2
SIZE (requests-0.12.1.tar.gz) = 78245
(-)py-requests/files/patch-requests_models.py (-10 / +4 lines)
Lines 1-21 Link Here
1
--- requests/models.py.orig	2012-04-23 04:13:53.000000000 +0200
1
--- requests/models.py.orig	2012-05-08 07:13:56.000000000 +0200
2
+++ requests/models.py	2012-04-23 18:22:55.000000000 +0200
2
+++ requests/models.py	2012-05-19 13:33:03.000000000 +0200
3
@@ -15,12 +15,12 @@
3
@@ -17,12 +17,6 @@
4
 from .status_codes import codes
5
 
4
 
6
 from .auth import HTTPBasicAuth, HTTPProxyAuth
5
 from .auth import HTTPBasicAuth, HTTPProxyAuth
6
 from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
7
-from .packages.urllib3.response import HTTPResponse
7
-from .packages.urllib3.response import HTTPResponse
8
-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
8
-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
9
-from .packages.urllib3.exceptions import SSLError as _SSLError
9
-from .packages.urllib3.exceptions import SSLError as _SSLError
10
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
10
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
11
-from .packages.urllib3 import connectionpool, poolmanager
11
-from .packages.urllib3 import connectionpool, poolmanager
12
-from .packages.urllib3.filepost import encode_multipart_formdata
12
-from .packages.urllib3.filepost import encode_multipart_formdata
13
+from urllib3.response import HTTPResponse
14
+from urllib3.exceptions import MaxRetryError, LocationParseError
15
+from urllib3.exceptions import SSLError as _SSLError
16
+from urllib3.exceptions import HTTPError as _HTTPError
17
+from urllib3 import connectionpool, poolmanager
18
+from urllib3.filepost import encode_multipart_formdata
19
 from .defaults import SCHEMAS
13
 from .defaults import SCHEMAS
20
 from .exceptions import (
14
 from .exceptions import (
21
     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
15
     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
(-)py-requests/files/patch-setup.py (-20 / +27 lines)
Lines 1-22 Link Here
1
--- setup.py.orig	2012-02-15 09:48:23.000000000 +0100
1
--- setup.py.orig	2012-05-08 06:56:28.000000000 +0200
2
+++ setup.py	2012-04-01 12:00:30.000000000 +0200
2
+++ setup.py	2012-05-19 13:42:13.000000000 +0200
3
@@ -4,10 +4,9 @@
3
@@ -11,7 +11,7 @@
4
 import os
4
 from requests.compat import is_py3
5
 import sys
6
 import requests
7
-from requests.compat import is_py3, is_py2
8
 
5
 
9
 try:
6
 try:
10
-    from setuptools import setup
7
-    from setuptools import setup
11
+    from setuptools import setup, find_packages
8
+    from setuptools import setup, find_packages
9
     # hush pyflakes
10
     setup
12
 except ImportError:
11
 except ImportError:
13
     from distutils.core import setup
12
@@ -21,31 +21,8 @@
14
 
13
     os.system('python setup.py sdist upload')
15
@@ -21,21 +20,8 @@
16
     os.system('python test_requests.py')
17
     sys.exit()
14
     sys.exit()
18
 
15
 
19
-required = ['certifi>=0.0.7',]
20
-packages = [
16
-packages = [
21
-    'requests',
17
-    'requests',
22
-    'requests.packages',
18
-    'requests.packages',
Lines 26-42 Link Here
26
-    'requests.packages.urllib3.packages.mimetools_choose_boundary',
22
-    'requests.packages.urllib3.packages.mimetools_choose_boundary',
27
-]
23
-]
28
-
24
-
25
-# certifi is a Python package containing a CA certificate bundle for SSL verification.
26
-# On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can
27
-# use the system CA bundle instead; see `requests.utils` for details.
28
-# If your platform is supported, set `requires` to [] instead:
29
-requires = ['certifi>=0.0.7']
30
-
31
-# chardet is used to optimally guess the encodings of pages that don't declare one.
32
-# At this time, chardet is not a required dependency. However, it's sufficiently
33
-# important that pip/setuptools should install it when it's unavailable.
29
-if is_py3:
34
-if is_py3:
30
-    required.append('chardet2')
35
-    chardet_package = 'chardet2'
31
-else:
36
-else:
32
-    required.append('chardet>=1.0.0')
37
-    chardet_package = 'chardet>=1.0.0'
33
-    packages.append('requests.packages.oreos')
38
-    requires.append('oauthlib>=0.1.0,<0.2.0')
39
-
40
-requires.append(chardet_package)
34
+# FreeBSD ports tree, provides only chardet2
41
+# FreeBSD ports tree, provides only chardet2
35
+required = ['certifi>=0.0.7', 'chardet>=2.0.0']
42
+requires = ['certifi>=0.0.7', 'chardet>=2.0.0']
36
 
37
 
43
 
38
 setup(
44
 # The async API in requests.async requires the gevent package.
39
@@ -47,7 +33,7 @@
45
 # This is also not a required dependency.
46
@@ -62,7 +39,7 @@
40
     author='Kenneth Reitz',
47
     author='Kenneth Reitz',
41
     author_email='me@kennethreitz.com',
48
     author_email='me@kennethreitz.com',
42
     url='http://python-requests.org',
49
     url='http://python-requests.org',
Lines 44-47 Link Here
44
+    packages=find_packages(exclude=['requests.packages.url*']),
51
+    packages=find_packages(exclude=['requests.packages.url*']),
45
     package_data={'': ['LICENSE', 'NOTICE']},
52
     package_data={'': ['LICENSE', 'NOTICE']},
46
     include_package_data=True,
53
     include_package_data=True,
47
     install_requires=required,
54
     install_requires=requires,

Return to bug 168136