From e295a6ae2cd9a6819c9eabe3f545cd52d206c307 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sun, 30 Dec 2012 17:17:28 +0000
Subject: [PATCH] - update to py-requests-1.0.4

---
 www/py-requests/Makefile  |   6 +-
 www/py-requests/distinfo  |   4 +-
 www/py-requests/pkg/PLIST | 184 ++++++++++++++++----------------------
 3 files changed, 80 insertions(+), 114 deletions(-)

diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index 475b923b3db..c5c9ba978f3 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2012/12/01 15:21:54 chl Exp $
+# $OpenBSD: Makefile,v 1.4 2012/12/30 17:17:28 jasper Exp $
 
 COMMENT=	elegant and simple HTTP library for Python
 
-MODPY_EGG_VERSION=0.14.2
+MODPY_EGG_VERSION=1.0.4
 DISTNAME=	requests-${MODPY_EGG_VERSION}
 PKGNAME=	py-requests-${MODPY_EGG_VERSION}
 
@@ -10,7 +10,7 @@ CATEGORIES=	www
 
 HOMEPAGE=	http://python-requests.org/
 
-# ISC
+# APLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
diff --git a/www/py-requests/distinfo b/www/py-requests/distinfo
index 2d83c3284b5..986e35e8622 100644
--- a/www/py-requests/distinfo
+++ b/www/py-requests/distinfo
@@ -1,2 +1,2 @@
-SHA256 (requests-0.14.2.tar.gz) = DjNFqKwNcSvxe9nTJ2QVBQxflyJlq2KZPNRUCjoaqu8=
-SIZE (requests-0.14.2.tar.gz) = 361488
+SHA256 (requests-1.0.4.tar.gz) = 82NpCkfdTW1udgX8aGtmgJehFM2Ubf/fIf4MampG+eY=
+SIZE (requests-1.0.4.tar.gz) = 336280
diff --git a/www/py-requests/pkg/PLIST b/www/py-requests/pkg/PLIST
index 4777cfea2be..d71359ea654 100644
--- a/www/py-requests/pkg/PLIST
+++ b/www/py-requests/pkg/PLIST
@@ -1,20 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/12/01 13:39:16 chl Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/12/30 17:17:28 jasper Exp $
 lib/python${MODPY_VERSION}/site-packages/requests/
 lib/python${MODPY_VERSION}/site-packages/requests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/requests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/requests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/requests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/requests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
 lib/python${MODPY_VERSION}/site-packages/requests-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/requests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/requests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/_oauth.py
-lib/python${MODPY_VERSION}/site-packages/requests/_oauth.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/adapters.py
 lib/python${MODPY_VERSION}/site-packages/requests/adapters.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/api.py
 lib/python${MODPY_VERSION}/site-packages/requests/api.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/async.py
-lib/python${MODPY_VERSION}/site-packages/requests/async.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/auth.py
 lib/python${MODPY_VERSION}/site-packages/requests/auth.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
@@ -24,8 +21,6 @@ lib/python${MODPY_VERSION}/site-packages/requests/compat.py
 lib/python${MODPY_VERSION}/site-packages/requests/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/cookies.py
 lib/python${MODPY_VERSION}/site-packages/requests/cookies.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/defaults.py
-lib/python${MODPY_VERSION}/site-packages/requests/defaults.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/requests/exceptions.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/hooks.py
@@ -35,106 +30,79 @@ lib/python${MODPY_VERSION}/site-packages/requests/models.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/packages/
 lib/python${MODPY_VERSION}/site-packages/requests/packages/__init__.py
 lib/python${MODPY_VERSION}/site-packages/requests/packages/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/__init__.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/big5freq.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/big5freq.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/big5prober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/big5prober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/chardistribution.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/chardistribution.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/charsetgroupprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/charsetgroupprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/charsetprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/charsetprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/codingstatemachine.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/codingstatemachine.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/constants.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/constants.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/escprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/escprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/escsm.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/escsm.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/eucjpprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/eucjpprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euckrfreq.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euckrfreq.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euckrprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euckrprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euctwfreq.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euctwfreq.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euctwprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/euctwprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/gb2312freq.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/gb2312freq.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/gb2312prober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/gb2312prober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/hebrewprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/hebrewprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/jisfreq.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/jisfreq.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/jpcntx.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/jpcntx.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langbulgarianmodel.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langbulgarianmodel.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langcyrillicmodel.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langcyrillicmodel.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langgreekmodel.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langgreekmodel.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langhebrewmodel.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langhebrewmodel.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langhungarianmodel.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langhungarianmodel.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langthaimodel.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/langthaimodel.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/latin1prober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/latin1prober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/mbcharsetprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/mbcharsetprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/mbcsgroupprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/mbcsgroupprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/mbcssm.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/mbcssm.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/sbcharsetprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/sbcharsetprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/sbcsgroupprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/sbcsgroupprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/sjisprober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/sjisprober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/universaldetector.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/universaldetector.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/utf8prober.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/chardet/utf8prober.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/common.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/common.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/__init__.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/__init__.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/parameters.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/parameters.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/signature.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/signature.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/utils.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth1/rfc5849/utils.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/__init__.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/__init__.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/parameters.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/parameters.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/tokens.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/tokens.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/utils.py
-lib/python${MODPY_VERSION}/site-packages/requests/packages/oauthlib/oauth2/draft25/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/__init__.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/big5freq.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/big5freq.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/big5prober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/big5prober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/chardistribution.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/chardistribution.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/charsetgroupprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/charsetgroupprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/charsetprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/charsetprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/codingstatemachine.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/codingstatemachine.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/compat.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/compat.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/constants.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/constants.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/escprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/escprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/escsm.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/escsm.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/eucjpprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/eucjpprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euckrfreq.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euckrfreq.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euckrprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euckrprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euctwfreq.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euctwfreq.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euctwprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/euctwprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/gb2312freq.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/gb2312freq.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/gb2312prober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/gb2312prober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/hebrewprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/hebrewprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/jisfreq.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/jisfreq.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/jpcntx.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/jpcntx.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langbulgarianmodel.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langbulgarianmodel.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langcyrillicmodel.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langcyrillicmodel.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langgreekmodel.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langgreekmodel.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langhebrewmodel.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langhebrewmodel.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langhungarianmodel.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langhungarianmodel.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langthaimodel.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/langthaimodel.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/latin1prober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/latin1prober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/mbcharsetprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/mbcharsetprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/mbcsgroupprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/mbcsgroupprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/mbcssm.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/mbcssm.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/sbcharsetprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/sbcharsetprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/sbcsgroupprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/sbcsgroupprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/sjisprober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/sjisprober.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/universaldetector.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/universaldetector.pyc
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/utf8prober.py
+lib/python${MODPY_VERSION}/site-packages/requests/packages/charade/utf8prober.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/
 lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/__init__.py
 lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/__init__.pyc
@@ -164,8 +132,6 @@ lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/response.py
 lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/response.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/util.py
 lib/python${MODPY_VERSION}/site-packages/requests/packages/urllib3/util.pyc
-lib/python${MODPY_VERSION}/site-packages/requests/safe_mode.py
-lib/python${MODPY_VERSION}/site-packages/requests/safe_mode.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/sessions.py
 lib/python${MODPY_VERSION}/site-packages/requests/sessions.pyc
 lib/python${MODPY_VERSION}/site-packages/requests/status_codes.py