ports/164092: [UPDATE] www/py-requests to 0.9.1

Fri Jan 13 17:50:09 UTC 2012

>Number:         164092
>Category:       ports
>Synopsis:       [UPDATE] www/py-requests to 0.9.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 13 17:50:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
ChangeLog:

- Danger_mode for automatic Response.raise_for_status()
- Response.iter_lines refator
- Verify ssl is default.
- iter_lines last-line truncation fix
- Force safe_mode for async requests
- Handle safe_mode exceptions more consistently
- Fix iteration on null responses in safe_mode

Note to commiter, now this port dependants of net/urllib3 (PR163972), like external library (before, it was installed with py-requests). We should add an entry in UPDATE file to inform users. They must delete previous version of www/py-requests, and then add new one.  
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/www/py-requests/Makefile py-requests/Makefile

--- /usr/ports/www/py-requests/Makefile	2011-12-04 10:36:17.000000000 +0100
+++ py-requests/Makefile	2012-01-12 23:32:05.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	requests
-PORTVERSION=	0.8.3
+PORTVERSION=	0.9.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,9 @@
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gevent/__init__.py:${PORTSDIR}/devel/py-gevent
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gevent/__init__.py:${PORTSDIR}/devel/py-gevent \
+	${PYTHON_SITELIBDIR}/certifi/__init__.py:${PORTSDIR}/security/py-certifi \
+	${PYTHON_PKGNAMEPREFIX}urllib3>=1.1:${PORTSDIR}/net/py-urllib3
 
 USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	easy_install
diff -urN /usr/ports/www/py-requests/distinfo py-requests/distinfo
--- /usr/ports/www/py-requests/distinfo	2011-12-04 10:36:17.000000000 +0100
+++ py-requests/distinfo	2012-01-12 23:32:05.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (requests-0.8.3.tar.gz) = 7277ec1fc8b8251bc1ce628651cbfad886704a77aea9f6203dcc042a4f12d214
-SIZE (requests-0.8.3.tar.gz) = 51252
+SHA256 (requests-0.9.1.tar.gz) = 0c6fc89ce4f8976dd8ddb1a9e896315a47fb3f1dba95417fd3fa8e626ca9a1e7
+SIZE (requests-0.9.1.tar.gz) = 55547
diff -urN /usr/ports/www/py-requests/files/patch-requests.egg-info_SOURCES.txt py-requests/files/patch-requests.egg-info_SOURCES.txt
--- /usr/ports/www/py-requests/files/patch-requests.egg-info_SOURCES.txt	1970-01-01 01:00:00.000000000 +0100
+++ py-requests/files/patch-requests.egg-info_SOURCES.txt	2012-01-12 23:32:05.000000000 +0100
@@ -0,0 +1,17 @@
+--- requests.egg-info/SOURCES.txt.orig	2012-01-06 07:11:01.000000000 +0100
++++ requests.egg-info/SOURCES.txt	2012-01-12 18:54:42.000000000 +0100
+@@ -27,13 +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/packages/__init__.py
+-requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+\ No newline at end of file
diff -urN /usr/ports/www/py-requests/files/patch-requests_models.py py-requests/files/patch-requests_models.py
--- /usr/ports/www/py-requests/files/patch-requests_models.py	1970-01-01 01:00:00.000000000 +0100
+++ py-requests/files/patch-requests_models.py	2012-01-12 23:32:05.000000000 +0100
@@ -0,0 +1,21 @@
+--- requests/models.py.orig	2011-12-28 09:56:17.000000000 +0100
++++ requests/models.py	2012-01-12 17:54:01.000000000 +0100
+@@ -19,12 +19,12 @@
+ from .status_codes import codes
+ from .packages import oreos
+ from .auth import HTTPBasicAuth, HTTPProxyAuth
+-from .packages.urllib3.response import HTTPResponse
+-from .packages.urllib3.exceptions import MaxRetryError
+-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.response import HTTPResponse
++from urllib3.exceptions import MaxRetryError
++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 .exceptions import (
+     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
+     URLRequired, SSLError)
diff -urN /usr/ports/www/py-requests/files/patch-requests_packages___init__.py py-requests/files/patch-requests_packages___init__.py
--- /usr/ports/www/py-requests/files/patch-requests_packages___init__.py	1970-01-01 01:00:00.000000000 +0100
+++ py-requests/files/patch-requests_packages___init__.py	2012-01-12 23:32:05.000000000 +0100
@@ -0,0 +1,7 @@
+--- 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 -urN /usr/ports/www/py-requests/files/patch-requests_sessions.py py-requests/files/patch-requests_sessions.py
--- /usr/ports/www/py-requests/files/patch-requests_sessions.py	1970-01-01 01:00:00.000000000 +0100
+++ py-requests/files/patch-requests_sessions.py	2012-01-12 23:32:05.000000000 +0100
@@ -0,0 +1,11 @@
+--- 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 -urN /usr/ports/www/py-requests/files/patch-setup.py py-requests/files/patch-setup.py
--- /usr/ports/www/py-requests/files/patch-setup.py	1970-01-01 01:00:00.000000000 +0100
+++ py-requests/files/patch-setup.py	2012-01-12 23:32:05.000000000 +0100
@@ -0,0 +1,18 @@
+--- setup.py.orig	2011-12-28 10:39:34.000000000 +0100
++++ setup.py	2012-01-12 23:21:56.000000000 +0100
+@@ -39,14 +39,12 @@
+     packages=[
+         'requests',
+         'requests.packages',
+-        'requests.packages.urllib3',
+-        'requests.packages.urllib3.packages',
+-        'requests.packages.urllib3.packages.ssl_match_hostname',
+         'requests.packages.oreos'
+     ],
+     package_data={'': ['LICENSE', 'NOTICE']},
+     include_package_data=True,
+     install_requires=required,
++    zip_safe=True,
+     license='ISC',
+     classifiers=(
+         'Development Status :: 5 - Production/Stable',


>Release-Note:
>Audit-Trail:
>Unformatted:

