[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#22643)

Wed Oct 15 19:48:26 CEST 2014

https://hg.python.org/cpython/rev/ffabb674140c
changeset: 93081:ffabb674140c
parent: 93076:8195d48a5c43
parent: 93080:33290d0dd946
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 15 13:40:15 2014 -0400
summary:
 merge 3.4 (#22643)
files:
 Lib/test/test_unicode.py | 1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -702,6 +702,7 @@
 '\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)
-- 
Repository URL: https://hg.python.org/cpython
