Remove unneeded files. Requested by Arfrever

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

2 files changed, 5 insertions, 130 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index da4f242c2d87..16d3aa893f5e 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pytest
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.27 2011/07/03 09:13:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.28 2011/07/07 07:29:30 hwoarang Exp $
+
+  07 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
+  -files/pytest-2.0.0-nose-1.0+python-3.patch:
+  Remove unneeded files. Requested by Arfrever
 
   03 Jul 2011; Markos Chandras <hwoarang@gentoo.org> pytest-2.0.3.ebuild:
   Stable on amd64 wrt bug #373363
diff --git a/dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch b/dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch
deleted file mode 100644
index aa4a987311d5..000000000000
--- a/dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-https://bitbucket.org/hpk42/pytest/changeset/98eb11d8887b
-
---- testing/test_nose.py
-+++ testing/test_nose.py
-@@ -6,7 +6,9 @@
- def test_nose_setup(testdir):
-     p = testdir.makepyfile("""
-         l = []
-+        from nose.tools import with_setup
- 
-+        @with_setup(lambda: l.append(1), lambda: l.append(2))
-         def test_hello():
-             assert l == [1]
- 
-@@ -24,6 +26,8 @@
- 
- def test_nose_setup_func(testdir):
-     p = testdir.makepyfile("""
-+        from nose.tools import with_setup
-+
-         l = []
- 
-         def my_setup():
-@@ -34,16 +38,15 @@
-             b = 2
-             l.append(b)
- 
-+        @with_setup(my_setup, my_teardown)
-         def test_hello():
--            print l
-+            print (l)
-             assert l == [1]
- 
-         def test_world():
--            print l
-+            print (l)
-             assert l == [1,2]
- 
--        test_hello.setup = my_setup
--        test_hello.teardown = my_teardown
-     """)
-     result = testdir.runpytest(p, '-p', 'nose')
-     result.stdout.fnmatch_lines([
-@@ -53,25 +56,25 @@
- 
- def test_nose_setup_func_failure(testdir):
-     p = testdir.makepyfile("""
--        l = []
-+        from nose.tools import with_setup
- 
-+        l = []
-         my_setup = lambda x: 1
-         my_teardown = lambda x: 2
- 
-+        @with_setup(my_setup, my_teardown)
-         def test_hello():
--            print l
-+            print (l)
-             assert l == [1]
- 
-         def test_world():
--            print l
-+            print (l)
-             assert l == [1,2]
- 
--        test_hello.setup = my_setup
--        test_hello.teardown = my_teardown
-     """)
-     result = testdir.runpytest(p, '-p', 'nose')
-     result.stdout.fnmatch_lines([
--        "*TypeError: <lambda>() takes exactly 1 argument (0 given)*"
-+        "*TypeError: <lambda>() takes exactly 1*0 given*"
-     ])
- 
- 
-@@ -83,11 +86,11 @@
-         my_teardown = 2
- 
-         def test_hello():
--            print l
-+            print (l)
-             assert l == [1]
- 
-         def test_world():
--            print l
-+            print (l)
-             assert l == [1,2]
- 
-         test_hello.setup = my_setup
-@@ -118,11 +121,11 @@
-         my_teardown_partial = partial(my_teardown, 2)
- 
-         def test_hello():
--            print l
-+            print (l)
-             assert l == [1]
- 
-         def test_world():
--            print l
-+            print (l)
-             assert l == [1,2]
- 
-         test_hello.setup = my_setup_partial
-@@ -173,21 +176,21 @@
- 
-         class TestClass(object):
-             def setup(self):
--                print "setup called in", self
-+                print ("setup called in %s" % self)
-                 self.called = ['setup']
- 
-             def teardown(self):
--                print "teardown called in", self
-+                print ("teardown called in %s" % self)
-                 eq_(self.called, ['setup'])
-                 self.called.append('teardown')
- 
-             def test(self):
--                print "test called in", self
-+                print ("test called in %s" % self)
-                 for i in range(0, 5):
-                     yield self.check, i
- 
-             def check(self, i):
--                print "check called in", self
-+                print ("check called in %s" % self)
-                 expect = ['setup']
-                 #for x in range(0, i):
-                 #    expect.append('setup')