Revision bump. Fixed tests. Closes bug #276881

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 48 insertions, 36 deletions

diff --git a/dev-python/utidylib/ChangeLog b/dev-python/utidylib/ChangeLog
index 563155f0cfb1..86e1ddd6b990 100644
--- a/dev-python/utidylib/ChangeLog
+++ b/dev-python/utidylib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/utidylib
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/ChangeLog,v 1.7 2008/05/02 18:41:01 pythonhead Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/ChangeLog,v 1.8 2009/07/25 16:13:11 neurogeek Exp $
+
+*utidylib-0.2-r1 (25 Jul 2009)
+
+  25 Jul 2009; Jesus Rivero <neurogeek@gentoo.org> -utidylib-0.2.ebuild,
+  +utidylib-0.2-r1.ebuild, files/utidylib-0.2-fix_tests.patch,
+  -files/utidylib-0.2-tests-twisted-2.1-compat.patch:
+  Revision bump. Fixed tests. Closes bug #276881
 
   02 May 2008; Rob Cakebread <pythonhead@gentoo.org> utidylib-0.2.ebuild:
   Use berlios mirror. bug #218657
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index ac85fb1dd373..5cb63c6d3ce4 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX utidylib-0.2-fix_tests.patch 1585 RMD160 1cb1603322b8a397d7794827dd3ecd6ff1367cf4 SHA1 81c4689820829a615279a7964d1abdf2452be65c SHA256 8db1ce0399b2ca8ded39164475c73f2e1ec1a6546f9e4f2d72c328660177c764
+AUX utidylib-0.2-fix_tests.patch 2084 RMD160 6f0bee4e54fda8d505be9c5ec917097b6ebf7f03 SHA1 f86ea2950cfab3c638e98b8cbff109067a0db49a SHA256 03ba2748262258d5b682b679728c19d498cef9c65cc8c794534ff992ded9b150
 AUX utidylib-0.2-no-docs-in-site-packages.patch 475 RMD160 e2806dc81b3537821cb83c09aefec81df5c27e43 SHA1 cd92da31f7a3eedf34b4ba79465ae6a64a6f85e7 SHA256 c833649b3ea32c48526b5cf819606ebf5edd98e42c299169e91397e72b4e35bf
-AUX utidylib-0.2-tests-twisted-2.1-compat.patch 437 RMD160 d2e767fc76feb44f32d127fd7218a02cd329130c SHA1 ebcd88ae80fa921e4786d725a1ecb99fe6d2d64c SHA256 9e0657e7a2e799ff80c6b0236ac655aac5f9853104e422fd52dc73f75507cca5
 DIST uTidylib-0.2.zip 17575 RMD160 c0a80ced37ea93e678ba80bf1d5b18c93506719c SHA1 bbbd11016a80c2001180fbd33b550cb293d0f9a3 SHA256 0385b29b0e636fa1cc6eb86ecb5428cf399f9474c8f343af038afce59720a333
-EBUILD utidylib-0.2.ebuild 1116 RMD160 9ca2ee4c7e629bc257cb66e71cc7c10786e32245 SHA1 87f14c1bb08d5ac35d3fc1cd32d5c772ca77966b SHA256 402a228937d20129c9fd1c092206abc067092868953324125a57f80e45e12b4c
-MISC ChangeLog 1221 RMD160 03acdd90a7ad7cf7572b43928bc2d40b6aca16d7 SHA1 73f6bd42c6dae506b4cc9995700f4a6417ad8ca1 SHA256 dd25b216f4fd5d2364d06eec081385b8ed2346b34c615d0c24710bad7f5b080a
+EBUILD utidylib-0.2-r1.ebuild 1095 RMD160 b9bd4bf239a1f77e77fae40597a0adf46b11293a SHA1 9d5131038eb718262d45e677c98aaaac965479c9 SHA256 24c7dbe7d669869614b76978672b6a52f3241cb15e5cc366e0b7f47a7c617589
+MISC ChangeLog 1492 RMD160 34d3ac15fa521c12b7ce8df99124567a48447111 SHA1 d92f4224ad0d0f29980c3fd4e15d208542b1424a SHA256 45afda1e3fa4d152846a3c682748cf224b21488c9f8d7324bad6db45f502d953
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgbYEoACgkQ8aihIaC/zgAphwCbBJ/ny0MEY3pPxwxkDZxJBpA9
-lCkAoKc4tY9AuGAQr3BjBwh5GPehXaOi
-=F/oW
+iEYEARECAAYFAkprLykACgkQdIssYB9vBoNWawCeJD1I8ERmdv8oi0WcqRHFxyKI
+fYwAoIXchc1CUj027Bws5xkx3FFrvF9X
+=WzrL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
index 319430134910..b55a15119ba4 100644
--- a/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
+++ b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
@@ -1,17 +1,34 @@
---- tidy/test_tidy.py.orig	2007-01-06 21:43:08.000000000 +0100
-+++ tidy/test_tidy.py	2007-01-06 21:43:27.000000000 +0100
-@@ -20,8 +20,8 @@
+diff -uNr uTidylib-0.2.orig/tidy/test_tidy.py uTidylib-0.2/tidy/test_tidy.py
+--- uTidylib-0.2.orig/tidy/test_tidy.py	2004-02-24 08:53:52.000000000 +0000
++++ uTidylib-0.2/tidy/test_tidy.py	2009-07-25 15:50:56.000000000 +0000
+@@ -4,6 +4,10 @@
+ 
+ class TidyTestCase(unittest.TestCase):
+     def __init__(self, *args, **kwargs):
++        super(unittest.TestCase, self).__init__(*args, **kwargs)
++        self._shared = False
++        self._parents = []
++
+         foo = u'''<html>
+     <h1>woot</h1>
+     <hr>
+@@ -13,13 +17,13 @@
+   </body>
+ </html>
+ '''.encode('utf8')
+-        file('foo.htm', 'w').write(foo)
++        file('foo.htm', 'w').write(foo)
+         self.input1 = "<html><script>1>2</script>"
+         self.input2 = "<html>\n" + "<p>asdkfjhasldkfjhsldjas\n" * 100
      def defaultDocs(self):
          doc1 = tidy.parseString(self.input1)
          doc2 = tidy.parseString(self.input2)
 -        doc3 = tidy.parse("foo.htm")
--        doc4 = tidy.parse("bar.htm") # doesn't exist
 +        doc3 = tidy.parse("../foo.htm")
-+        doc4 = tidy.parse("../bar.htm") # doesn't exist
+         doc4 = tidy.parse("bar.htm") # doesn't exist
          return (doc1, doc2, doc3, doc4)
      def test_badOptions(self):
-         badopts = [{'foo': 1}, {'indent': '---'}, {'indent_spaces': None}]
-@@ -34,7 +34,7 @@
+@@ -33,7 +37,7 @@
                  self.fail("Invalid option %s should have raised an error" %
                            repr(dct))
      def test_encodings(self):
@@ -20,7 +37,7 @@
                                                             'xmlcharrefreplace')
          doc1u = tidy.parseString(foo, input_encoding='ascii',
                                   output_encoding='latin1')
-@@ -59,7 +59,7 @@
+@@ -58,7 +62,7 @@
  ##        self.failIf(len(doc2.errors)>1) # FIXME - tidylib doesn't
  ##                                        # support this?
          self.failUnless(str(doc2).find('\n')<0)
diff --git a/dev-python/utidylib/files/utidylib-0.2-tests-twisted-2.1-compat.patch b/dev-python/utidylib/files/utidylib-0.2-tests-twisted-2.1-compat.patch
deleted file mode 100644
index 0ee55e6d5631..000000000000
--- a/dev-python/utidylib/files/utidylib-0.2-tests-twisted-2.1-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur uTidylib-0.2-orig/tidy/test_tidy.py uTidylib-0.2/tidy/test_tidy.py
---- uTidylib-0.2-orig/tidy/test_tidy.py	2005-12-01 00:48:14.000000000 +0100
-+++ uTidylib-0.2/tidy/test_tidy.py	2005-12-01 00:48:40.000000000 +0100
-@@ -4,6 +4,7 @@
- 
- class TidyTestCase(unittest.TestCase):
-     def __init__(self, *args, **kwargs):
-+        unittest.TestCase.__init__(self, *args, **kwargs)
-         foo = u'''<html>
-     <h1>woot</h1>
-     <hr>
diff --git a/dev-python/utidylib/utidylib-0.2.ebuild b/dev-python/utidylib/utidylib-0.2-r1.ebuild
index 9f164be9bcb4..2fa98c202f24 100644
--- a/dev-python/utidylib/utidylib-0.2.ebuild
+++ b/dev-python/utidylib/utidylib-0.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/utidylib-0.2.ebuild,v 1.7 2008/05/02 18:41:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/utidylib/utidylib-0.2-r1.ebuild,v 1.1 2009/07/25 16:13:11 neurogeek Exp $
 
-inherit distutils eutils
+EAPI="2"
+inherit distutils
 
 MY_P="uTidylib-${PV}"
 
@@ -26,10 +27,7 @@ DEPEND="${RDEPEND}
 PYTHON_MODNAME="tidy"
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-tests-twisted-2.1-compat.patch"
+src_prepare(){
 	epatch "${FILESDIR}/${P}-no-docs-in-site-packages.patch"
 	epatch "${FILESDIR}/${P}-fix_tests.patch"
 }
@@ -42,7 +40,9 @@ src_compile() {
 }
 
 src_test() {
-	trial tidy || die "tests failed"
+	einfo "${S}"
+	einfo "$(ls ${S}/foo.htm)"
+	PYTHONPATH="." trial tidy || die "tests failed"
 }
 
 src_install() {