merge 3.4 (#22643)

benjaminp · benjaminp · commit dc8899f0e2e0 · 2014-10-15T13:40:15.000-04:00
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
@@ -702,6 +702,7 @@ def test_center(self):
                          '\U0010FFFFx\U0010FFFF\U0010FFFF')
 
     @unittest.skipUnless(sys.maxsize == 2**31 - 1, "requires 32-bit system")
+    @support.cpython_only
     def test_case_operation_overflow(self):
         # Issue #22643
         self.assertRaises(OverflowError, ("ü"*(2**32//12 + 1)).upper)
