python: Update to 2.7.12.

[people/stevee/ipfire-3.x.git] / python / patches / 00157-uid-gid-overflows.patch

diff --git a/python/patches/00157-uid-gid-overflows.patch b/python/patches/00157-uid-gid-overflows.patch
index 13546bbf7bedeb303bc710a2afe2bcc1018d118b..a31c98af6677667768c04df03e2330c9c7fab10a 100644 (file)
--- a/python/patches/00157-uid-gid-overflows.patch
+++ b/python/patches/00157-uid-gid-overflows.patch
@@ -2,48 +2,48 @@ diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/tes
 --- Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400
 +++ Python-2.7.3/Lib/test/test_os.py   2012-06-26 14:51:36.000817929 -0400
 @@ -677,30 +677,36 @@ if sys.platform != 'win32':
-             def test_setuid(self):
-                 if os.getuid() != 0:
-                     self.assertRaises(os.error, os.setuid, 0)
-+                self.assertRaises(TypeError, os.setuid, 'not an int')
-                 self.assertRaises(OverflowError, os.setuid, 1<<32)
+     def test_setuid(self):
+         if os.getuid() != 0:
+             self.assertRaises(os.error, os.setuid, 0)
++        self.assertRaises(TypeError, os.setuid, 'not an int')
+         self.assertRaises(OverflowError, os.setuid, 1<<32)
  
-         if hasattr(os, 'setgid'):
-             def test_setgid(self):
-                 if os.getuid() != 0:
-                     self.assertRaises(os.error, os.setgid, 0)
-+                self.assertRaises(TypeError, os.setgid, 'not an int')
-                 self.assertRaises(OverflowError, os.setgid, 1<<32)
+     @unittest.skipUnless(hasattr(os, 'setgid'), 'test needs os.setgid()')
+     def test_setgid(self):
+         if os.getuid() != 0:
+             self.assertRaises(os.error, os.setgid, 0)
++        self.assertRaises(TypeError, os.setgid, 'not an int')
+         self.assertRaises(OverflowError, os.setgid, 1<<32)
  
-         if hasattr(os, 'seteuid'):
-             def test_seteuid(self):
-                 if os.getuid() != 0:
-                     self.assertRaises(os.error, os.seteuid, 0)
-+                self.assertRaises(TypeError, os.seteuid, 'not an int')
-                 self.assertRaises(OverflowError, os.seteuid, 1<<32)
+     @unittest.skipUnless(hasattr(os, 'seteuid'), 'test needs os.seteuid()')
+     def test_seteuid(self):
+         if os.getuid() != 0:
+             self.assertRaises(os.error, os.seteuid, 0)
++        self.assertRaises(TypeError, os.seteuid, 'not an int')
+         self.assertRaises(OverflowError, os.seteuid, 1<<32)
  
-         if hasattr(os, 'setegid'):
-             def test_setegid(self):
-                 if os.getuid() != 0:
-                     self.assertRaises(os.error, os.setegid, 0)
-+                self.assertRaises(TypeError, os.setegid, 'not an int')
-                 self.assertRaises(OverflowError, os.setegid, 1<<32)
+     @unittest.skipUnless(hasattr(os, 'setegid'), 'test needs os.setegid()')
+     def test_setegid(self):
+         if os.getuid() != 0:
+             self.assertRaises(os.error, os.setegid, 0)
++        self.assertRaises(TypeError, os.setegid, 'not an int')
+         self.assertRaises(OverflowError, os.setegid, 1<<32)
  
-         if hasattr(os, 'setreuid'):
-             def test_setreuid(self):
-                 if os.getuid() != 0:
-                     self.assertRaises(os.error, os.setreuid, 0, 0)
-+                self.assertRaises(TypeError, os.setreuid, 'not an int', 0)
-+                self.assertRaises(TypeError, os.setreuid, 0, 'not an int')
-                 self.assertRaises(OverflowError, os.setreuid, 1<<32, 0)
-                 self.assertRaises(OverflowError, os.setreuid, 0, 1<<32)
+     @unittest.skipUnless(hasattr(os, 'setreuid'), 'test needs os.setreuid()')
+     def test_setreuid(self):
+         if os.getuid() != 0:
+             self.assertRaises(os.error, os.setreuid, 0, 0)
++        self.assertRaises(TypeError, os.setreuid, 'not an int', 0)
++        self.assertRaises(TypeError, os.setreuid, 0, 'not an int')
+         self.assertRaises(OverflowError, os.setreuid, 1<<32, 0)
+         self.assertRaises(OverflowError, os.setreuid, 0, 1<<32)
  
 @@ -715,6 +721,8 @@ if sys.platform != 'win32':
-             def test_setregid(self):
-                 if os.getuid() != 0:
-                     self.assertRaises(os.error, os.setregid, 0, 0)
-+                self.assertRaises(TypeError, os.setregid, 'not an int', 0)
-+                self.assertRaises(TypeError, os.setregid, 0, 'not an int')
-                 self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
-                 self.assertRaises(OverflowError, os.setregid, 0, 1<<32)
+     def test_setregid(self):
+         if os.getuid() != 0:
+             self.assertRaises(os.error, os.setregid, 0, 0)
++        self.assertRaises(TypeError, os.setregid, 'not an int', 0)
++        self.assertRaises(TypeError, os.setregid, 0, 'not an int')
+         self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
+         self.assertRaises(OverflowError, os.setregid, 0, 1<<32)