python: Update to 2.7.12.

[people/stevee/ipfire-3.x.git] / python / patches / 00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch

diff --git a/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch b/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch
index 845fb2a906c24dcc3466af2cf5b95f5a93b4eb5f..4d7626f479d10b7b1cc73aab462cced6b52b24a0 100644 (file)
--- a/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch
+++ b/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch
@@ -1,22 +1,11 @@
-diff -up Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpmbuild Python-2.7.2/Lib/test/test_file2k.py
---- Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpmbuild       2011-09-08 17:23:50.922520729 -0400
-+++ Python-2.7.2/Lib/test/test_file2k.py       2011-09-08 17:24:41.368517277 -0400
-@@ -213,6 +213,7 @@ class OtherFileTests(unittest.TestCase):
+diff -up Python-2.7.6/Lib/test/test_file2k.py.stdin-test Python-2.7.6/Lib/test/test_file2k.py
+--- Python-2.7.6/Lib/test/test_file2k.py.stdin-test    2013-11-10 08:36:40.000000000 +0100
++++ Python-2.7.6/Lib/test/test_file2k.py       2014-01-29 14:28:01.029488055 +0100
+@@ -223,6 +223,7 @@ class OtherFileTests(unittest.TestCase):
              else:
                  f.close()
  
 +    @unittest._skipInRpmBuild('seems not to raise the exception when run in Koji')
-     def testStdin(self):
-         # This causes the interpreter to exit on OSF1 v5.1.
-         if sys.platform != 'osf1V5':
-diff -up Python-2.7.2/Lib/test/test_file.py.skip-tests-of-seeking-stdin-in-rpmbuild Python-2.7.2/Lib/test/test_file.py
---- Python-2.7.2/Lib/test/test_file.py.skip-tests-of-seeking-stdin-in-rpmbuild 2011-09-08 17:20:31.146534389 -0400
-+++ Python-2.7.2/Lib/test/test_file.py 2011-09-08 17:24:45.016517030 -0400
-@@ -154,6 +154,7 @@ class OtherFileTests(unittest.TestCase):
-                 f.close()
-                 self.fail('%r is an invalid file mode' % mode)
- 
-+    @unittest._skipInRpmBuild('seems not to raise the exception when run in Koji')
-     def testStdin(self):
-         # This causes the interpreter to exit on OSF1 v5.1.
-         if sys.platform != 'osf1V5':
+     def testStdinSeek(self):
+         if sys.platform == 'osf1V5':
+             # This causes the interpreter to exit on OSF1 v5.1.