Update to 0.9.1 and drop upstreamed patches

.gitignore

@@ -5,3 +5,4 @@ httplib2-0.4.0.tar.gz
 /httplib2-0.7.6.tar.gz
 /httplib2-0.7.7.tar.gz
 /httplib2-0.9.tar.gz
+/httplib2-0.9.1.tar.gz

python-httplib2-0.9-binary-header-python3.patch

@@ -1,59 +0,0 @@
-From 93ba12c7d7483af5374ba5f0e62a46ddc5e1ffe2 Mon Sep 17 00:00:00 2001
-From: i026e <klev.paul@gmail.com>
-Date: Wed, 17 Dec 2014 11:25:07 +0300
-Subject: [PATCH 1/2] Update __init__.py
-
-There is a problem with headers when a binary string is passed (like b'Authorization')
-I've added a function to decode such strings.
-It is not an elegant solution, but it works for me
----
- python3/httplib2/__init__.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
-index 43f7419..b7b00b1 100644
---- a/python3/httplib2/__init__.py
-+++ b/python3/httplib2/__init__.py
-@@ -192,8 +192,13 @@ def safename(filename):
- 
- NORMALIZE_SPACE = re.compile(r'(?:\r\n)?[ \t]+')
- def _normalize_headers(headers):
--    return dict([ (key.lower(), NORMALIZE_SPACE.sub(value, ' ').strip())  for (key, value) in headers.items()])
-+    return dict([ (_convert_byte_str(key).lower(), NORMALIZE_SPACE.sub(_convert_byte_str(value), ' ').strip())  for (key, value) in headers.items()])
- 
-+def _convert_byte_str(s):
-+    if not isinstance(s, str):
-+        return str(s, 'utf-8')
-+    return s
-+    
- def _parse_cache_control(headers):
-     retval = {}
-     if 'cache-control' in headers:
-
-From 1cf37bd8f5ddc8ac629b07031f7c5341840b5b7e Mon Sep 17 00:00:00 2001
-From: Cristobal <cganterh@gmail.com>
-Date: Mon, 2 Mar 2015 21:00:03 -0300
-Subject: [PATCH 2/2] Added unit test for _convert_byte_str in
- python3/httplib2test.py.
-
----
- python3/httplib2test.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/python3/httplib2test.py b/python3/httplib2test.py
-index 5f786bd..246956a 100755
---- a/python3/httplib2test.py
-+++ b/python3/httplib2test.py
-@@ -1235,6 +1235,12 @@ def testNormalizeHeaders(self):
-         self.assertTrue('cache-control' in h)
-         self.assertTrue('other' in h)
-         self.assertEqual('Stuff', h['other'])
-+    
-+    def testConvertByteStr(self):
-+        with self.assertRaises(TypeError):
-+            httplib2._convert_byte_str(4)
-+        self.assertEqual('Hello World', httplib2._convert_byte_str(b'Hello World'))
-+        self.assertEqual('Bye World', httplib2._convert_byte_str('Bye World'))
- 
-     def testExpirationModelTransparent(self):
-         # Test that no-cache makes our request TRANSPARENT

python-httplib2.spec

@@ -9,8 +9,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-httplib2
-Version:        0.9
+Version:        0.9.1
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        A comprehensive HTTP client library
 Group:          System Environment/Libraries
 License:        MIT
@@ -33,11 +33,6 @@ Patch4:         python-httplib2-0.9-proxy-http.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=958638
 #
 Patch5:         python-httplib2-0.9-cve-2013-2037.patch
-#
-# Fix binary header handling in python3
-# https://github.com/jcgregorio/httplib2/pull/296
-#
-Patch6:         python-httplib2-0.9-binary-header-python3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-setuptools
@@ -69,7 +64,6 @@ other HTTP libraries.
 %patch3 -p0 -b .rfc2459
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -110,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif # with_python3
 
 %changelog
+* Sun Apr 12 2015 Kevin Fenzi <kevin@scrye.com> 0.9.1-1
+- Update to 0.9.1 and drop upstreamed patches
+
 * Fri Apr 03 2015 Kevin Fenzi <kevin@scrye.com> 0.9-6
 - Add patch to fix http over proxy. Fixes bug #857514
 - Add patch to fix CVE-2013-2037. Fixes bug #958640

sources

@@ -1 +1 @@
-09d8e8016911fc40e2e4c58f1aa3ec24  httplib2-0.9.tar.gz
+c49590437e4c5729505d034cd34a8528  httplib2-0.9.1.tar.gz