Revert utf8 patch as it breaks python2.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 13 insertions, 27 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index fcc1fcf0cb6a..066b5084b2dc 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.120 2013/02/09 17:33:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.121 2013/02/09 20:05:07 floppym Exp $
+
+  09 Feb 2013; Mike Gilbert <floppym@gentoo.org>
+  -files/logilab-common-0.59.0-utf8-test.patch, logilab-common-0.59.0.ebuild:
+  Revert utf8 patch as it breaks python2.
 
   09 Feb 2013; Ian Delaney <idella4@gentoo.org>
   +files/logilab-common-0.59.0-utf8-test.patch, logilab-common-0.59.0.ebuild:
diff --git a/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch b/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch
deleted file mode 100644
index f0cd39addbc6..000000000000
--- a/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur logilab-common-0.59.0.orig/test/unittest_umessage.py logilab-common-0.59.0/test/unittest_umessage.py
---- test/unittest_umessage.py	2013-01-24 01:42:03.000000000 +0800
-+++ test/unittest_umessage.py	2013-02-10 00:53:58.431767641 +0800
-@@ -21,16 +21,17 @@
- 
- from logilab.common.testlib import TestCase, unittest_main
- from logilab.common.umessage import UMessage, decode_QP
-+import io
- 
- DATA = join(dirname(abspath(__file__)), 'data')
- 
- class UMessageTC(TestCase):
- 
-     def setUp(self):
--        msg1 = email.message_from_file(open(join(DATA, 'test1.msg')))
-+        msg1 = email.message_from_file(io.open(join(DATA, 'test1.msg'), encoding='utf8'))
-         self.umessage1 = UMessage(msg1)
--        msg2 = email.message_from_file(open(join(DATA, 'test2.msg')))
-+        msg2 = email.message_from_file(io.open(join(DATA, 'test2.msg'), encoding='utf8'))
-         self.umessage2 = UMessage(msg2)
- 
-     def test_get_subject(self):
diff --git a/dev-python/logilab-common/logilab-common-0.59.0.ebuild b/dev-python/logilab-common/logilab-common-0.59.0.ebuild
index 4be295097bff..8d5f933206a4 100644
--- a/dev-python/logilab-common/logilab-common-0.59.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.59.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.0.ebuild,v 1.4 2013/02/09 17:33:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.0.ebuild,v 1.5 2013/02/09 20:05:07 floppym Exp $
 
 EAPI=5
 # broken with python3.3, bug #449276
@@ -31,10 +31,12 @@ DEPEND="${RDEPEND}
 	)
 	doc? ( dev-python/epydoc )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-syntax.patch
+)
+
 python_prepare_all() {
 	sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
-	epatch "${FILESDIR}"/${P}-syntax.patch \
-		"${FILESDIR}"/${P}-utf8-test.patch
 	distutils-r1_python_prepare_all
 }
 
@@ -63,13 +65,15 @@ python_test() {
 	local bindir=${tpath}/bin
 	local libdir=${tpath}/lib
 	local PYTHONPATH=${libdir}:${PYTHONPATH}
-	export TZ=UTC
 
 	mkdir -p "${libdir}" || die
 	esetup.py egg_info --egg-base="${tpath}" \
 		install --install-lib="${libdir}" --install-scripts="${bindir}" \
 		bdist_egg --dist-dir="${tpath}"
 
+	# Prevent timezone related failure.
+	export TZ=UTC
+
 	# Make sure that the tests use correct modules.
 	cd "${libdir}" || die
 	"${bindir}"/pytest || die "Tests fail with ${EPYTHON}"