From: Stefan Krah <skrah@bytereef.org>
Date: Thu, 17 Jan 2013 14:34:50 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1588
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8e59feeb5643b9643f8bd86e418c09f4b93c475;p=thirdparty%2FPython%2Fcpython.git

Merge 3.3.
---

a8e59feeb5643b9643f8bd86e418c09f4b93c475
diff --cc Lib/test/test_os.py
index ff39c787d34f,184c9ae31f70..32a67e57c177
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@@ -1240,8 -1243,8 +1243,8 @@@ if sys.platform != 'win32'
  
          if hasattr(os, 'setgid'):
              def test_setgid(self):
-                 if os.getuid() != 0:
+                 if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
 -                    self.assertRaises(os.error, os.setgid, 0)
 +                    self.assertRaises(OSError, os.setgid, 0)
                  self.assertRaises(OverflowError, os.setgid, 1<<32)
  
          if hasattr(os, 'seteuid'):
@@@ -1252,8 -1255,8 +1255,8 @@@
  
          if hasattr(os, 'setegid'):
              def test_setegid(self):
-                 if os.getuid() != 0:
+                 if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
 -                    self.assertRaises(os.error, os.setegid, 0)
 +                    self.assertRaises(OSError, os.setegid, 0)
                  self.assertRaises(OverflowError, os.setegid, 1<<32)
  
          if hasattr(os, 'setreuid'):
@@@ -1272,8 -1275,8 +1275,8 @@@
  
          if hasattr(os, 'setregid'):
              def test_setregid(self):
-                 if os.getuid() != 0:
+                 if os.getuid() != 0 and not HAVE_WHEEL_GROUP:
 -                    self.assertRaises(os.error, os.setregid, 0, 0)
 +                    self.assertRaises(OSError, os.setregid, 0, 0)
                  self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
                  self.assertRaises(OverflowError, os.setregid, 0, 1<<32)