dev-python/httpheader: Added patch from dmeranda/httpheader#7 to support python3

Package-Manager: portage-2.2.20.1

Author: ercpe

dev-python/httpheader/ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*httpheader-1.1_p1 (05 Dec 2015)
+
+  05 Dec 2015; Johann Schmitz <ercpe@gentoo.org>
+  +files/httpheader-1.1-python3.patch, +httpheader-1.1_p1.ebuild:
+  dev-python/httpheader: Added patch from
+  https://github.com/dmeranda/httpheader/pull/7 to support python3
+
 *httpheader-1.1 (05 Dec 2015)
 
   05 Dec 2015; Johann Schmitz <ercpe@gentoo.org> +httpheader-1.1.ebuild,

dev-python/httpheader/Manifest

@@ -1 +1,2 @@
 DIST httpheader-1.1.tar.gz 30404 SHA256 eac1d1cea15fbbf1aead6ff099e4d7ab1623f8dbfb04c1824d7bb0672c351987 SHA512 f95ae510c9840b47d49df763cb12bc3a318f8bb83393ab185e34a41a60eeee2f8fbfa52e5105ac7326692187817d2e25354f7b5c78a3deec82cfc4997aa5442a WHIRLPOOL 4123217b5549f96a7fa83afa65876dab5e7ca84113227b45751bf9e2e2508147e179db2d22979dc8c2e16d367af8ee39785bd97f26c1635d90ec876bb3f84db8
+DIST httpheader-1.1_p1.tar.gz 30404 SHA256 eac1d1cea15fbbf1aead6ff099e4d7ab1623f8dbfb04c1824d7bb0672c351987 SHA512 f95ae510c9840b47d49df763cb12bc3a318f8bb83393ab185e34a41a60eeee2f8fbfa52e5105ac7326692187817d2e25354f7b5c78a3deec82cfc4997aa5442a WHIRLPOOL 4123217b5549f96a7fa83afa65876dab5e7ca84113227b45751bf9e2e2508147e179db2d22979dc8c2e16d367af8ee39785bd97f26c1635d90ec876bb3f84db8

dev-python/httpheader/files/httpheader-1.1-python3.patch

@@ -0,0 +1,90 @@
+From 5804d7a276ef156dd0e977228b631dd1f543ca96 Mon Sep 17 00:00:00 2001
+From: Johann Schmitz <johann@j-schmitz.net>
+Date: Sat, 5 Dec 2015 07:15:18 +0100
+Subject: [PATCH] Python3 support (via 2to3). May need some extra work.
+
+---
+ httpheader.py | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/httpheader.py b/httpheader.py
+index e07bff4..abc5a6e 100644
+--- a/httpheader.py
++++ b/httpheader.py
+@@ -100,6 +100,8 @@
+ DIGIT = '0123456789'
+ HEX = '0123456789ABCDEFabcdef'
+ 
++import sys
++
+ # Try to get a set/frozenset implementation if possible
+ try:
+     type(frozenset)
+@@ -126,7 +128,7 @@
+ 
+ def _is_string( obj ):
+     """Returns True if the object is a string or unicode type."""
+-    return isinstance(obj,str) or isinstance(obj,unicode)
++    return isinstance(obj, str) or isinstance(obj, unicode) if sys.version_info.major == 2 else isinstance(obj, str)
+ 
+ 
+ def http_datetime( dt=None ):
+@@ -496,10 +498,10 @@ def _test_comments():
+     def _testrm( a, b, collapse ):
+         b2 = remove_comments( a, collapse )
+         if b != b2:
+-            print 'Comment test failed:'
+-            print '   remove_comments( %s, collapse_spaces=%s ) -> %s' \
+-                  % (repr(a), repr(collapse), repr(b2))
+-            print '   expected %s' % repr(b)
++            print('Comment test failed:')
++            print('   remove_comments( %s, collapse_spaces=%s ) -> %s' \
++                  % (repr(a), repr(collapse), repr(b2)))
++            print('   expected %s' % repr(b))
+             return 1
+         return 0
+     failures = 0
+@@ -1333,6 +1335,9 @@ def _set_minor(self, s):
+     minor = property(_get_minor,_set_minor,doc="Minor media sub-classification")
+ 
+     def __nonzero__(self):
++        return self.__bool__()
++
++    def __bool__(self):
+         return True
+ 
+     def __str__(self):
+@@ -1340,13 +1345,13 @@ def __str__(self):
+         s = '%s/%s' % (self.major, self.minor)
+         if self.parmdict:
+             extra = '; '.join([ '%s=%s' % (a[0],quote_string(a[1],False)) \
+-                                for a in self.parmdict.items()])
++                                for a in list(self.parmdict.items())])
+             s += '; ' + extra
+         return s
+ 
+     def __unicode__(self):
+         """Unicode string value."""
+-        return unicode(self.__str__())
++        return str(self.__str__())
+ 
+     def __repr__(self):
+         """Python representation of this object."""
+@@ -1509,7 +1514,7 @@ def acceptable_content_type( accept_header, content_types, ignore_wildcard=True
+                 elif client_ct.minor == server_ct.minor: # something/something is a 3
+                     matchlen = 3
+                     # must make sure all the parms match too
+-                    for pname, pval in client_ct.parmdict.items():
++                    for pname, pval in list(client_ct.parmdict.items()):
+                         sval = server_ct.parmdict.get(pname)
+                         if pname == 'charset':
+                             # special case for charset to match aliases
+@@ -1764,7 +1769,7 @@ def __str__(self):
+ 
+     def __unicode__(self):
+         """The unicode string form of this language tag."""
+-        return unicode(self.__str__())
++        return str(self.__str__())
+ 
+     def __repr__(self):
+         """The python representation of this language tag."""

dev-python/httpheader/httpheader-1.1_p1.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit python-r1 vcs-snapshot
+
+DESCRIPTION="Python module to deal with HTTP headers and content negotiation"
+HOMEPAGE="http://deron.meranda.us/python/httpheader/ https://github.com/dmeranda/httpheader"
+SRC_URI="https://github.com/dmeranda/httpheader/archive/release-${PV/_p1/}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P/_p1/}-python3.patch
+}
+
+src_compile() {
+	use doc && make pydoc
+}
+
+src_install() {
+	python_foreach_impl python_domodule ${PN}.py
+
+	use doc && dodoc ${PN}.html
+}