Updated to latest release, 2.2.0. Some PLIST changes, but two packages that

depend on it still build and install fine. From HISTORY.rst:

2.2.0 (2014-01-09)
++++++++++++++++++

**API Changes**
- New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
  ``DecodeError`` exceptions.

**Bugfixes**
- Avoid many many exceptions from the buggy implementation of ``proxy_bypass``
  on OS X in Python 2.6.
- Avoid crashing when attempting to get authentication credentions from
  ~/.netrc when running as a user without a home directory.
- Use the correct pool size for pools of connections to proxies.
- Fix iteration of ``CookieJar`` objects.
- Ensure that cookies are persisted over redirect.
- Switch back to using chardet since charade has merged with it

3 files changed, 122 insertions, 122 deletions

diff --git a/devel/py-requests/Makefile b/devel/py-requests/Makefile
index 1214277d051..e35d87c1dfe 100644
--- a/devel/py-requests/Makefile
+++ b/devel/py-requests/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/01/05 17:47:10 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/16 02:52:19 rodent Exp $
 
-DISTNAME=	v2.1.0
+DISTNAME=	v2.2.0
 EGG_NAME=	requests-${DISTNAME:S/v//}
 PKGNAME=	${PYPKGPREFIX}-${EGG_NAME}
 CATEGORIES=	devel www
@@ -14,7 +14,7 @@ LICENSE=	apache-2.0
 
 WRKSRC=		${WRKDIR}/${EGG_NAME}
 USE_LANGUAGES=	c
-REPLACE_PYTHON=	requests/certs.py
+REPLACE_PYTHON=	requests/certs.py requests/packages/chardet/chardetect.py
 
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
diff --git a/devel/py-requests/PLIST b/devel/py-requests/PLIST
index 2697725f82f..dc842b0bb88 100644
--- a/devel/py-requests/PLIST
+++ b/devel/py-requests/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/01/05 17:47:10 rodent Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/01/16 02:52:19 rodent Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -38,120 +38,120 @@ ${PYSITELIB}/requests/models.pyo
 ${PYSITELIB}/requests/packages/__init__.py
 ${PYSITELIB}/requests/packages/__init__.pyc
 ${PYSITELIB}/requests/packages/__init__.pyo
-${PYSITELIB}/requests/packages/charade/__init__.py
-${PYSITELIB}/requests/packages/charade/__init__.pyc
-${PYSITELIB}/requests/packages/charade/__init__.pyo
-${PYSITELIB}/requests/packages/charade/__main__.py
-${PYSITELIB}/requests/packages/charade/__main__.pyc
-${PYSITELIB}/requests/packages/charade/__main__.pyo
-${PYSITELIB}/requests/packages/charade/big5freq.py
-${PYSITELIB}/requests/packages/charade/big5freq.pyc
-${PYSITELIB}/requests/packages/charade/big5freq.pyo
-${PYSITELIB}/requests/packages/charade/big5prober.py
-${PYSITELIB}/requests/packages/charade/big5prober.pyc
-${PYSITELIB}/requests/packages/charade/big5prober.pyo
-${PYSITELIB}/requests/packages/charade/chardistribution.py
-${PYSITELIB}/requests/packages/charade/chardistribution.pyc
-${PYSITELIB}/requests/packages/charade/chardistribution.pyo
-${PYSITELIB}/requests/packages/charade/charsetgroupprober.py
-${PYSITELIB}/requests/packages/charade/charsetgroupprober.pyc
-${PYSITELIB}/requests/packages/charade/charsetgroupprober.pyo
-${PYSITELIB}/requests/packages/charade/charsetprober.py
-${PYSITELIB}/requests/packages/charade/charsetprober.pyc
-${PYSITELIB}/requests/packages/charade/charsetprober.pyo
-${PYSITELIB}/requests/packages/charade/codingstatemachine.py
-${PYSITELIB}/requests/packages/charade/codingstatemachine.pyc
-${PYSITELIB}/requests/packages/charade/codingstatemachine.pyo
-${PYSITELIB}/requests/packages/charade/compat.py
-${PYSITELIB}/requests/packages/charade/compat.pyc
-${PYSITELIB}/requests/packages/charade/compat.pyo
-${PYSITELIB}/requests/packages/charade/constants.py
-${PYSITELIB}/requests/packages/charade/constants.pyc
-${PYSITELIB}/requests/packages/charade/constants.pyo
-${PYSITELIB}/requests/packages/charade/cp949prober.py
-${PYSITELIB}/requests/packages/charade/cp949prober.pyc
-${PYSITELIB}/requests/packages/charade/cp949prober.pyo
-${PYSITELIB}/requests/packages/charade/escprober.py
-${PYSITELIB}/requests/packages/charade/escprober.pyc
-${PYSITELIB}/requests/packages/charade/escprober.pyo
-${PYSITELIB}/requests/packages/charade/escsm.py
-${PYSITELIB}/requests/packages/charade/escsm.pyc
-${PYSITELIB}/requests/packages/charade/escsm.pyo
-${PYSITELIB}/requests/packages/charade/eucjpprober.py
-${PYSITELIB}/requests/packages/charade/eucjpprober.pyc
-${PYSITELIB}/requests/packages/charade/eucjpprober.pyo
-${PYSITELIB}/requests/packages/charade/euckrfreq.py
-${PYSITELIB}/requests/packages/charade/euckrfreq.pyc
-${PYSITELIB}/requests/packages/charade/euckrfreq.pyo
-${PYSITELIB}/requests/packages/charade/euckrprober.py
-${PYSITELIB}/requests/packages/charade/euckrprober.pyc
-${PYSITELIB}/requests/packages/charade/euckrprober.pyo
-${PYSITELIB}/requests/packages/charade/euctwfreq.py
-${PYSITELIB}/requests/packages/charade/euctwfreq.pyc
-${PYSITELIB}/requests/packages/charade/euctwfreq.pyo
-${PYSITELIB}/requests/packages/charade/euctwprober.py
-${PYSITELIB}/requests/packages/charade/euctwprober.pyc
-${PYSITELIB}/requests/packages/charade/euctwprober.pyo
-${PYSITELIB}/requests/packages/charade/gb2312freq.py
-${PYSITELIB}/requests/packages/charade/gb2312freq.pyc
-${PYSITELIB}/requests/packages/charade/gb2312freq.pyo
-${PYSITELIB}/requests/packages/charade/gb2312prober.py
-${PYSITELIB}/requests/packages/charade/gb2312prober.pyc
-${PYSITELIB}/requests/packages/charade/gb2312prober.pyo
-${PYSITELIB}/requests/packages/charade/hebrewprober.py
-${PYSITELIB}/requests/packages/charade/hebrewprober.pyc
-${PYSITELIB}/requests/packages/charade/hebrewprober.pyo
-${PYSITELIB}/requests/packages/charade/jisfreq.py
-${PYSITELIB}/requests/packages/charade/jisfreq.pyc
-${PYSITELIB}/requests/packages/charade/jisfreq.pyo
-${PYSITELIB}/requests/packages/charade/jpcntx.py
-${PYSITELIB}/requests/packages/charade/jpcntx.pyc
-${PYSITELIB}/requests/packages/charade/jpcntx.pyo
-${PYSITELIB}/requests/packages/charade/langbulgarianmodel.py
-${PYSITELIB}/requests/packages/charade/langbulgarianmodel.pyc
-${PYSITELIB}/requests/packages/charade/langbulgarianmodel.pyo
-${PYSITELIB}/requests/packages/charade/langcyrillicmodel.py
-${PYSITELIB}/requests/packages/charade/langcyrillicmodel.pyc
-${PYSITELIB}/requests/packages/charade/langcyrillicmodel.pyo
-${PYSITELIB}/requests/packages/charade/langgreekmodel.py
-${PYSITELIB}/requests/packages/charade/langgreekmodel.pyc
-${PYSITELIB}/requests/packages/charade/langgreekmodel.pyo
-${PYSITELIB}/requests/packages/charade/langhebrewmodel.py
-${PYSITELIB}/requests/packages/charade/langhebrewmodel.pyc
-${PYSITELIB}/requests/packages/charade/langhebrewmodel.pyo
-${PYSITELIB}/requests/packages/charade/langhungarianmodel.py
-${PYSITELIB}/requests/packages/charade/langhungarianmodel.pyc
-${PYSITELIB}/requests/packages/charade/langhungarianmodel.pyo
-${PYSITELIB}/requests/packages/charade/langthaimodel.py
-${PYSITELIB}/requests/packages/charade/langthaimodel.pyc
-${PYSITELIB}/requests/packages/charade/langthaimodel.pyo
-${PYSITELIB}/requests/packages/charade/latin1prober.py
-${PYSITELIB}/requests/packages/charade/latin1prober.pyc
-${PYSITELIB}/requests/packages/charade/latin1prober.pyo
-${PYSITELIB}/requests/packages/charade/mbcharsetprober.py
-${PYSITELIB}/requests/packages/charade/mbcharsetprober.pyc
-${PYSITELIB}/requests/packages/charade/mbcharsetprober.pyo
-${PYSITELIB}/requests/packages/charade/mbcsgroupprober.py
-${PYSITELIB}/requests/packages/charade/mbcsgroupprober.pyc
-${PYSITELIB}/requests/packages/charade/mbcsgroupprober.pyo
-${PYSITELIB}/requests/packages/charade/mbcssm.py
-${PYSITELIB}/requests/packages/charade/mbcssm.pyc
-${PYSITELIB}/requests/packages/charade/mbcssm.pyo
-${PYSITELIB}/requests/packages/charade/sbcharsetprober.py
-${PYSITELIB}/requests/packages/charade/sbcharsetprober.pyc
-${PYSITELIB}/requests/packages/charade/sbcharsetprober.pyo
-${PYSITELIB}/requests/packages/charade/sbcsgroupprober.py
-${PYSITELIB}/requests/packages/charade/sbcsgroupprober.pyc
-${PYSITELIB}/requests/packages/charade/sbcsgroupprober.pyo
-${PYSITELIB}/requests/packages/charade/sjisprober.py
-${PYSITELIB}/requests/packages/charade/sjisprober.pyc
-${PYSITELIB}/requests/packages/charade/sjisprober.pyo
-${PYSITELIB}/requests/packages/charade/universaldetector.py
-${PYSITELIB}/requests/packages/charade/universaldetector.pyc
-${PYSITELIB}/requests/packages/charade/universaldetector.pyo
-${PYSITELIB}/requests/packages/charade/utf8prober.py
-${PYSITELIB}/requests/packages/charade/utf8prober.pyc
-${PYSITELIB}/requests/packages/charade/utf8prober.pyo
+${PYSITELIB}/requests/packages/chardet/__init__.py
+${PYSITELIB}/requests/packages/chardet/__init__.pyc
+${PYSITELIB}/requests/packages/chardet/__init__.pyo
+${PYSITELIB}/requests/packages/chardet/big5freq.py
+${PYSITELIB}/requests/packages/chardet/big5freq.pyc
+${PYSITELIB}/requests/packages/chardet/big5freq.pyo
+${PYSITELIB}/requests/packages/chardet/big5prober.py
+${PYSITELIB}/requests/packages/chardet/big5prober.pyc
+${PYSITELIB}/requests/packages/chardet/big5prober.pyo
+${PYSITELIB}/requests/packages/chardet/chardetect.py
+${PYSITELIB}/requests/packages/chardet/chardetect.pyc
+${PYSITELIB}/requests/packages/chardet/chardetect.pyo
+${PYSITELIB}/requests/packages/chardet/chardistribution.py
+${PYSITELIB}/requests/packages/chardet/chardistribution.pyc
+${PYSITELIB}/requests/packages/chardet/chardistribution.pyo
+${PYSITELIB}/requests/packages/chardet/charsetgroupprober.py
+${PYSITELIB}/requests/packages/chardet/charsetgroupprober.pyc
+${PYSITELIB}/requests/packages/chardet/charsetgroupprober.pyo
+${PYSITELIB}/requests/packages/chardet/charsetprober.py
+${PYSITELIB}/requests/packages/chardet/charsetprober.pyc
+${PYSITELIB}/requests/packages/chardet/charsetprober.pyo
+${PYSITELIB}/requests/packages/chardet/codingstatemachine.py
+${PYSITELIB}/requests/packages/chardet/codingstatemachine.pyc
+${PYSITELIB}/requests/packages/chardet/codingstatemachine.pyo
+${PYSITELIB}/requests/packages/chardet/compat.py
+${PYSITELIB}/requests/packages/chardet/compat.pyc
+${PYSITELIB}/requests/packages/chardet/compat.pyo
+${PYSITELIB}/requests/packages/chardet/constants.py
+${PYSITELIB}/requests/packages/chardet/constants.pyc
+${PYSITELIB}/requests/packages/chardet/constants.pyo
+${PYSITELIB}/requests/packages/chardet/cp949prober.py
+${PYSITELIB}/requests/packages/chardet/cp949prober.pyc
+${PYSITELIB}/requests/packages/chardet/cp949prober.pyo
+${PYSITELIB}/requests/packages/chardet/escprober.py
+${PYSITELIB}/requests/packages/chardet/escprober.pyc
+${PYSITELIB}/requests/packages/chardet/escprober.pyo
+${PYSITELIB}/requests/packages/chardet/escsm.py
+${PYSITELIB}/requests/packages/chardet/escsm.pyc
+${PYSITELIB}/requests/packages/chardet/escsm.pyo
+${PYSITELIB}/requests/packages/chardet/eucjpprober.py
+${PYSITELIB}/requests/packages/chardet/eucjpprober.pyc
+${PYSITELIB}/requests/packages/chardet/eucjpprober.pyo
+${PYSITELIB}/requests/packages/chardet/euckrfreq.py
+${PYSITELIB}/requests/packages/chardet/euckrfreq.pyc
+${PYSITELIB}/requests/packages/chardet/euckrfreq.pyo
+${PYSITELIB}/requests/packages/chardet/euckrprober.py
+${PYSITELIB}/requests/packages/chardet/euckrprober.pyc
+${PYSITELIB}/requests/packages/chardet/euckrprober.pyo
+${PYSITELIB}/requests/packages/chardet/euctwfreq.py
+${PYSITELIB}/requests/packages/chardet/euctwfreq.pyc
+${PYSITELIB}/requests/packages/chardet/euctwfreq.pyo
+${PYSITELIB}/requests/packages/chardet/euctwprober.py
+${PYSITELIB}/requests/packages/chardet/euctwprober.pyc
+${PYSITELIB}/requests/packages/chardet/euctwprober.pyo
+${PYSITELIB}/requests/packages/chardet/gb2312freq.py
+${PYSITELIB}/requests/packages/chardet/gb2312freq.pyc
+${PYSITELIB}/requests/packages/chardet/gb2312freq.pyo
+${PYSITELIB}/requests/packages/chardet/gb2312prober.py
+${PYSITELIB}/requests/packages/chardet/gb2312prober.pyc
+${PYSITELIB}/requests/packages/chardet/gb2312prober.pyo
+${PYSITELIB}/requests/packages/chardet/hebrewprober.py
+${PYSITELIB}/requests/packages/chardet/hebrewprober.pyc
+${PYSITELIB}/requests/packages/chardet/hebrewprober.pyo
+${PYSITELIB}/requests/packages/chardet/jisfreq.py
+${PYSITELIB}/requests/packages/chardet/jisfreq.pyc
+${PYSITELIB}/requests/packages/chardet/jisfreq.pyo
+${PYSITELIB}/requests/packages/chardet/jpcntx.py
+${PYSITELIB}/requests/packages/chardet/jpcntx.pyc
+${PYSITELIB}/requests/packages/chardet/jpcntx.pyo
+${PYSITELIB}/requests/packages/chardet/langbulgarianmodel.py
+${PYSITELIB}/requests/packages/chardet/langbulgarianmodel.pyc
+${PYSITELIB}/requests/packages/chardet/langbulgarianmodel.pyo
+${PYSITELIB}/requests/packages/chardet/langcyrillicmodel.py
+${PYSITELIB}/requests/packages/chardet/langcyrillicmodel.pyc
+${PYSITELIB}/requests/packages/chardet/langcyrillicmodel.pyo
+${PYSITELIB}/requests/packages/chardet/langgreekmodel.py
+${PYSITELIB}/requests/packages/chardet/langgreekmodel.pyc
+${PYSITELIB}/requests/packages/chardet/langgreekmodel.pyo
+${PYSITELIB}/requests/packages/chardet/langhebrewmodel.py
+${PYSITELIB}/requests/packages/chardet/langhebrewmodel.pyc
+${PYSITELIB}/requests/packages/chardet/langhebrewmodel.pyo
+${PYSITELIB}/requests/packages/chardet/langhungarianmodel.py
+${PYSITELIB}/requests/packages/chardet/langhungarianmodel.pyc
+${PYSITELIB}/requests/packages/chardet/langhungarianmodel.pyo
+${PYSITELIB}/requests/packages/chardet/langthaimodel.py
+${PYSITELIB}/requests/packages/chardet/langthaimodel.pyc
+${PYSITELIB}/requests/packages/chardet/langthaimodel.pyo
+${PYSITELIB}/requests/packages/chardet/latin1prober.py
+${PYSITELIB}/requests/packages/chardet/latin1prober.pyc
+${PYSITELIB}/requests/packages/chardet/latin1prober.pyo
+${PYSITELIB}/requests/packages/chardet/mbcharsetprober.py
+${PYSITELIB}/requests/packages/chardet/mbcharsetprober.pyc
+${PYSITELIB}/requests/packages/chardet/mbcharsetprober.pyo
+${PYSITELIB}/requests/packages/chardet/mbcsgroupprober.py
+${PYSITELIB}/requests/packages/chardet/mbcsgroupprober.pyc
+${PYSITELIB}/requests/packages/chardet/mbcsgroupprober.pyo
+${PYSITELIB}/requests/packages/chardet/mbcssm.py
+${PYSITELIB}/requests/packages/chardet/mbcssm.pyc
+${PYSITELIB}/requests/packages/chardet/mbcssm.pyo
+${PYSITELIB}/requests/packages/chardet/sbcharsetprober.py
+${PYSITELIB}/requests/packages/chardet/sbcharsetprober.pyc
+${PYSITELIB}/requests/packages/chardet/sbcharsetprober.pyo
+${PYSITELIB}/requests/packages/chardet/sbcsgroupprober.py
+${PYSITELIB}/requests/packages/chardet/sbcsgroupprober.pyc
+${PYSITELIB}/requests/packages/chardet/sbcsgroupprober.pyo
+${PYSITELIB}/requests/packages/chardet/sjisprober.py
+${PYSITELIB}/requests/packages/chardet/sjisprober.pyc
+${PYSITELIB}/requests/packages/chardet/sjisprober.pyo
+${PYSITELIB}/requests/packages/chardet/universaldetector.py
+${PYSITELIB}/requests/packages/chardet/universaldetector.pyc
+${PYSITELIB}/requests/packages/chardet/universaldetector.pyo
+${PYSITELIB}/requests/packages/chardet/utf8prober.py
+${PYSITELIB}/requests/packages/chardet/utf8prober.pyc
+${PYSITELIB}/requests/packages/chardet/utf8prober.pyo
 ${PYSITELIB}/requests/packages/urllib3/__init__.py
 ${PYSITELIB}/requests/packages/urllib3/__init__.pyc
 ${PYSITELIB}/requests/packages/urllib3/__init__.pyo
diff --git a/devel/py-requests/distinfo b/devel/py-requests/distinfo
index 867252cd6b8..05e2c987a01 100644
--- a/devel/py-requests/distinfo
+++ b/devel/py-requests/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/01/05 17:47:10 rodent Exp $
+$NetBSD: distinfo,v 1.3 2014/01/16 02:52:19 rodent Exp $
 
-SHA1 (v2.1.0.tar.gz) = 491ca9b89fb4a1c3c8dbbee14609d66b7e70b0ff
-RMD160 (v2.1.0.tar.gz) = db33a2f3170798f78fe9d5c34f67ab8f002fd883
-Size (v2.1.0.tar.gz) = 609754 bytes
+SHA1 (v2.2.0.tar.gz) = e9f768d85f99ffdc418903f81c289f771c498f7f
+RMD160 (v2.2.0.tar.gz) = d248146cdcc7be1eae8cf7e4dc4c8044723c70de
+Size (v2.2.0.tar.gz) = 610864 bytes