Attachment 125025 Details for Bug 168569 – py27-requests-0.13.0.patch

[patch] py27-requests-0.13.0.patch

py27-requests-0.13.0.patch (text/plain), 14.13 KB, created by koobs on 2012-06-02 15:00:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: koobs

Created: 2012-06-02 15:00:30 UTC

Size: 14.13 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/py-requests/Makefile ./Makefile
>--- /usr/ports/www/py-requests/Makefile	2012-05-22 19:24:47.000000000 +1000
>+++ ./Makefile	2012-06-02 23:51:57.000000000 +1000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	requests
>-PORTVERSION=	0.12.1
>+PORTVERSION=	0.13.0
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -18,21 +18,12 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gevent/__init__.py:${PORTSDIR}/devel/py-gevent \
>-		${PYTHON_SITELIBDIR}/certifi/__init__.py:${PORTSDIR}/security/py-certify \
>+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/certifi/__init__.py:${PORTSDIR}/security/py-certify \
> 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3 \
>-		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.1:${PORTSDIR}/textproc/py-chardet
>+		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.1:${PORTSDIR}/textproc/py-chardet \
>+		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.1.0:${PORTSDIR}/net/py-oauthlib
> 
> USE_PYTHON=	2.6-3.1
>-USE_PYDISTUTILS=	easy_install
>-
>-REINPLACE_ARGS=	-i ""
>-
>-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
>-
>-post-patch:
>-	@${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f \{\} \;
>-	@${FIND} ${WRKSRC} -type f -name '*.py' | \
>-		${XARGS} ${REINPLACE_CMD} 's|is_linux|is_freebsd|g'
>+USE_PYDISTUTILS=	yes
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/distinfo ./distinfo
>--- /usr/ports/www/py-requests/distinfo	2012-05-22 19:24:47.000000000 +1000
>+++ ./distinfo	2012-06-01 21:05:37.000000000 +1000
>@@ -1,2 +1,2 @@
>-SHA256 (requests-0.12.1.tar.gz) = 9ce56b87180c06728d96ca734055675abf8f5cc3136e0d7712a6260430685589
>-SIZE (requests-0.12.1.tar.gz) = 78245
>+SHA256 (requests-0.13.0.tar.gz) = 03a2001843546147ddb6972d0661e2002b9be4ccbbbd2177ee10f05bd1910109
>+SIZE (requests-0.13.0.tar.gz) = 68172
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests.egg-info_SOURCES.txt ./files/patch-requests.egg-info_SOURCES.txt
>--- /usr/ports/www/py-requests/files/patch-requests.egg-info_SOURCES.txt	2012-04-10 16:41:20.000000000 +1000
>+++ ./files/patch-requests.egg-info_SOURCES.txt	1970-01-01 10:00:00.000000000 +1000
>@@ -1,20 +0,0 @@
>---- requests.egg-info/SOURCES.txt.orig	2012-03-31 05:47:55.000000000 +0200
>-+++ requests.egg-info/SOURCES.txt	2012-04-01 12:01:46.000000000 +0200
>-@@ -27,16 +27,3 @@
>- requests/packages/oreos/core.py
>- requests/packages/oreos/monkeys.py
>- requests/packages/oreos/structures.py
>--requests/packages/urllib3/__init__.py
>--requests/packages/urllib3/_collections.py
>--requests/packages/urllib3/connectionpool.py
>--requests/packages/urllib3/exceptions.py
>--requests/packages/urllib3/filepost.py
>--requests/packages/urllib3/poolmanager.py
>--requests/packages/urllib3/request.py
>--requests/packages/urllib3/response.py
>--requests/packages/urllib3/util.py
>--requests/packages/urllib3/packages/__init__.py
>--requests/packages/urllib3/packages/six.py
>--requests/packages/urllib3/packages/mimetools_choose_boundary/__init__.py
>--requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
>-\ No newline at end of file
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests__models.py ./files/patch-requests__models.py
>--- /usr/ports/www/py-requests/files/patch-requests__models.py	1970-01-01 10:00:00.000000000 +1000
>+++ ./files/patch-requests__models.py	2012-06-02 00:25:16.000000000 +1000
>@@ -0,0 +1,19 @@
>+--- ./requests/models.py.orig	2012-06-02 00:23:03.000000000 +1000
>++++ ./requests/models.py	2012-06-02 00:23:54.000000000 +1000
>+@@ -17,11 +17,11 @@
>+ 
>+ from .auth import HTTPBasicAuth, HTTPProxyAuth
>+ from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
>+-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
>+-from .packages.urllib3.exceptions import SSLError as _SSLError
>+-from .packages.urllib3.exceptions import HTTPError as _HTTPError
>+-from .packages.urllib3 import connectionpool, poolmanager
>+-from .packages.urllib3.filepost import encode_multipart_formdata
>++from urllib3.exceptions import MaxRetryError, LocationParseError
>++from urllib3.exceptions import SSLError as _SSLError
>++from urllib3.exceptions import HTTPError as _HTTPError
>++from urllib3 import connectionpool, poolmanager
>++from urllib3.filepost import encode_multipart_formdata
>+ from .defaults import SCHEMAS
>+ from .exceptions import (
>+     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests__safe_mode.py ./files/patch-requests__safe_mode.py
>--- /usr/ports/www/py-requests/files/patch-requests__safe_mode.py	1970-01-01 10:00:00.000000000 +1000
>+++ ./files/patch-requests__safe_mode.py	2012-06-02 00:25:16.000000000 +1000
>@@ -0,0 +1,11 @@
>+--- ./requests/safe_mode.py.orig	2012-06-02 00:24:10.000000000 +1000
>++++ ./requests/safe_mode.py	2012-06-02 00:24:22.000000000 +1000
>+@@ -12,7 +12,7 @@
>+ """
>+ 
>+ from .models import Response
>+-from .packages.urllib3.response import HTTPResponse
>++from urllib3.response import HTTPResponse
>+ from .exceptions import RequestException, ConnectionError, HTTPError
>+ import socket
>+ 
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests__sessions.py ./files/patch-requests__sessions.py
>--- /usr/ports/www/py-requests/files/patch-requests__sessions.py	1970-01-01 10:00:00.000000000 +1000
>+++ ./files/patch-requests__sessions.py	2012-06-02 00:25:16.000000000 +1000
>@@ -0,0 +1,11 @@
>+--- ./requests/sessions.py.orig	2012-06-02 00:24:38.000000000 +1000
>++++ ./requests/sessions.py	2012-06-02 00:24:51.000000000 +1000
>+@@ -16,7 +16,7 @@
>+ from .models import Request
>+ from .hooks import dispatch_hook
>+ from .utils import header_expand
>+-from .packages.urllib3.poolmanager import PoolManager
>++from urllib3.poolmanager import PoolManager
>+ 
>+ def merge_kwargs(local_kwarg, default_kwarg):
>+     """Merges kwarg dictionaries.
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests_compat.py ./files/patch-requests_compat.py
>--- /usr/ports/www/py-requests/files/patch-requests_compat.py	2012-04-10 16:41:20.000000000 +1000
>+++ ./files/patch-requests_compat.py	1970-01-01 10:00:00.000000000 +1000
>@@ -1,13 +0,0 @@
>---- requests/compat.py.orig	2012-02-15 09:48:23.000000000 +0100
>-+++ requests/compat.py	2012-03-19 17:40:30.000000000 +0100
>-@@ -66,8 +66,8 @@
>- # Windows-based system.
>- is_windows = 'win32' in str(sys.platform).lower()
>- 
>--# Standard Linux 2+ system.
>--is_linux = ('linux' in str(sys.platform).lower())
>-+# Standard system.
>-+is_linux = ('freebsd' in str(sys.platform).lower())
>- is_osx = ('darwin' in str(sys.platform).lower())
>- is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
>- is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests_models.py ./files/patch-requests_models.py
>--- /usr/ports/www/py-requests/files/patch-requests_models.py	2012-05-22 19:24:47.000000000 +1000
>+++ ./files/patch-requests_models.py	1970-01-01 10:00:00.000000000 +1000
>@@ -1,15 +0,0 @@
>---- requests/models.py.orig	2012-05-08 07:13:56.000000000 +0200
>-+++ requests/models.py	2012-05-19 13:33:03.000000000 +0200
>-@@ -17,12 +17,6 @@
>- 
>- from .auth import HTTPBasicAuth, HTTPProxyAuth
>- from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
>--from .packages.urllib3.response import HTTPResponse
>--from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
>--from .packages.urllib3.exceptions import SSLError as _SSLError
>--from .packages.urllib3.exceptions import HTTPError as _HTTPError
>--from .packages.urllib3 import connectionpool, poolmanager
>--from .packages.urllib3.filepost import encode_multipart_formdata
>- from .defaults import SCHEMAS
>- from .exceptions import (
>-     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests_packages___init__.py ./files/patch-requests_packages___init__.py
>--- /usr/ports/www/py-requests/files/patch-requests_packages___init__.py	2012-03-04 23:56:25.000000000 +1100
>+++ ./files/patch-requests_packages___init__.py	1970-01-01 10:00:00.000000000 +1000
>@@ -1,7 +0,0 @@
>---- requests/packages/__init__.py.orig	2011-12-06 23:55:15.000000000 +0100
>-+++ requests/packages/__init__.py	2012-01-12 18:46:03.000000000 +0100
>-@@ -1,3 +1,3 @@
>- from __future__ import absolute_import
>- 
>--from . import urllib3
>-+#from . import urllib3
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-requests_sessions.py ./files/patch-requests_sessions.py
>--- /usr/ports/www/py-requests/files/patch-requests_sessions.py	2012-03-04 23:56:25.000000000 +1100
>+++ ./files/patch-requests_sessions.py	1970-01-01 10:00:00.000000000 +1000
>@@ -1,11 +0,0 @@
>---- requests/sessions.py.orig	2011-12-28 10:51:45.000000000 +0100
>-+++ requests/sessions.py	2012-01-12 23:30:39.000000000 +0100
>-@@ -13,7 +13,7 @@
>- from .models import Request
>- from .hooks import dispatch_hook
>- from .utils import header_expand
>--from .packages.urllib3.poolmanager import PoolManager
>-+from urllib3.poolmanager import PoolManager
>- 
>- 
>- def merge_kwargs(local_kwarg, default_kwarg):
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/files/patch-setup.py ./files/patch-setup.py
>--- /usr/ports/www/py-requests/files/patch-setup.py	2012-05-22 19:24:47.000000000 +1000
>+++ ./files/patch-setup.py	2012-06-02 00:25:16.000000000 +1000
>@@ -1,54 +1,37 @@
>---- setup.py.orig	2012-05-08 06:56:28.000000000 +0200
>-+++ setup.py	2012-05-19 13:42:13.000000000 +0200
>-@@ -11,7 +11,7 @@
>+--- ./setup.py.orig	2012-05-11 08:09:45.000000000 +1000
>++++ ./setup.py	2012-06-02 00:17:21.000000000 +1000
>+@@ -10,12 +10,7 @@
>+ import requests
>  from requests.compat import is_py3
>  
>- try:
>+-try:
> -    from setuptools import setup
>-+    from setuptools import setup, find_packages
>-     # hush pyflakes
>-     setup
>- except ImportError:
>-@@ -21,31 +21,8 @@
>+-    # hush pyflakes
>+-    setup
>+-except ImportError:
>+-    from distutils.core import setup
>++from distutils.core import setup
>+ 
>+ if sys.argv[-1] == 'publish':
>      os.system('python setup.py sdist upload')
>-     sys.exit()
>+@@ -23,11 +18,6 @@
>  
>--packages = [
>--    'requests',
>+ packages = [
>+     'requests',
> -    'requests.packages',
> -    'requests.packages.urllib3',
> -    'requests.packages.urllib3.packages',
> -    'requests.packages.urllib3.packages.ssl_match_hostname',
> -    'requests.packages.urllib3.packages.mimetools_choose_boundary',
>--]
>--
>--# certifi is a Python package containing a CA certificate bundle for SSL verification.
>--# On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can
>--# use the system CA bundle instead; see `requests.utils` for details.
>--# If your platform is supported, set `requires` to [] instead:
>--requires = ['certifi>=0.0.7']
>--
>--# chardet is used to optimally guess the encodings of pages that don't declare one.
>--# At this time, chardet is not a required dependency. However, it's sufficiently
>--# important that pip/setuptools should install it when it's unavailable.
>--if is_py3:
>--    chardet_package = 'chardet2'
>--else:
>--    chardet_package = 'chardet>=1.0.0'
>--    requires.append('oauthlib>=0.1.0,<0.2.0')
>--
>--requires.append(chardet_package)
>-+# FreeBSD ports tree, provides only chardet2
>-+requires = ['certifi>=0.0.7', 'chardet>=2.0.0']
>+ ]
>  
>- # The async API in requests.async requires the gevent package.
>- # This is also not a required dependency.
>-@@ -62,7 +39,7 @@
>-     author='Kenneth Reitz',
>-     author_email='me@kennethreitz.com',
>+ # certifi is a Python package containing a CA certificate bundle for SSL verification.
>+@@ -58,8 +48,6 @@
>      url='http://python-requests.org',
>--    packages=packages,
>-+    packages=find_packages(exclude=['requests.packages.url*']),
>+     packages=packages,
>      package_data={'': ['LICENSE', 'NOTICE']},
>-     include_package_data=True,
>-     install_requires=requires,
>+-    include_package_data=True,
>+-    install_requires=requires,
>+     license=open("LICENSE").read(),
>+     classifiers=(
>+         'Development Status :: 5 - Production/Stable',
>diff -ruN --exclude=CVS /usr/ports/www/py-requests/pkg-plist ./pkg-plist
>--- /usr/ports/www/py-requests/pkg-plist	1970-01-01 10:00:00.000000000 +1000
>+++ ./pkg-plist	2012-06-02 19:53:49.000000000 +1000
>@@ -0,0 +1,46 @@
>+%%PYTHON_SITELIBDIR%%/requests/__init__.py
>+%%PYTHON_SITELIBDIR%%/requests/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/requests/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/requests/api.py
>+%%PYTHON_SITELIBDIR%%/requests/api.pyc
>+%%PYTHON_SITELIBDIR%%/requests/api.pyo
>+%%PYTHON_SITELIBDIR%%/requests/async.py
>+%%PYTHON_SITELIBDIR%%/requests/async.pyc
>+%%PYTHON_SITELIBDIR%%/requests/async.pyo
>+%%PYTHON_SITELIBDIR%%/requests/auth.py
>+%%PYTHON_SITELIBDIR%%/requests/auth.pyc
>+%%PYTHON_SITELIBDIR%%/requests/auth.pyo
>+%%PYTHON_SITELIBDIR%%/requests/compat.py
>+%%PYTHON_SITELIBDIR%%/requests/compat.pyc
>+%%PYTHON_SITELIBDIR%%/requests/compat.pyo
>+%%PYTHON_SITELIBDIR%%/requests/cookies.py
>+%%PYTHON_SITELIBDIR%%/requests/cookies.pyc
>+%%PYTHON_SITELIBDIR%%/requests/cookies.pyo
>+%%PYTHON_SITELIBDIR%%/requests/defaults.py
>+%%PYTHON_SITELIBDIR%%/requests/defaults.pyc
>+%%PYTHON_SITELIBDIR%%/requests/defaults.pyo
>+%%PYTHON_SITELIBDIR%%/requests/exceptions.py
>+%%PYTHON_SITELIBDIR%%/requests/exceptions.pyc
>+%%PYTHON_SITELIBDIR%%/requests/exceptions.pyo
>+%%PYTHON_SITELIBDIR%%/requests/hooks.py
>+%%PYTHON_SITELIBDIR%%/requests/hooks.pyc
>+%%PYTHON_SITELIBDIR%%/requests/hooks.pyo
>+%%PYTHON_SITELIBDIR%%/requests/models.py
>+%%PYTHON_SITELIBDIR%%/requests/models.pyc
>+%%PYTHON_SITELIBDIR%%/requests/models.pyo
>+%%PYTHON_SITELIBDIR%%/requests/safe_mode.py
>+%%PYTHON_SITELIBDIR%%/requests/safe_mode.pyc
>+%%PYTHON_SITELIBDIR%%/requests/safe_mode.pyo
>+%%PYTHON_SITELIBDIR%%/requests/sessions.py
>+%%PYTHON_SITELIBDIR%%/requests/sessions.pyc
>+%%PYTHON_SITELIBDIR%%/requests/sessions.pyo
>+%%PYTHON_SITELIBDIR%%/requests/status_codes.py
>+%%PYTHON_SITELIBDIR%%/requests/status_codes.pyc
>+%%PYTHON_SITELIBDIR%%/requests/status_codes.pyo
>+%%PYTHON_SITELIBDIR%%/requests/structures.py
>+%%PYTHON_SITELIBDIR%%/requests/structures.pyc
>+%%PYTHON_SITELIBDIR%%/requests/structures.pyo
>+%%PYTHON_SITELIBDIR%%/requests/utils.py
>+%%PYTHON_SITELIBDIR%%/requests/utils.pyc
>+%%PYTHON_SITELIBDIR%%/requests/utils.pyo
>+@dirrm %%PYTHON_SITELIBDIR%%/requests

Actions: View | Diff

Attachments on bug 168569: 125025