From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 29 Sep 2011 01:36:38 +0000 (+0300)
Subject: Remove now useless redefinition of chr/ord for narrow builds in test_multibytecodec_s... 
X-Git-Tag: v3.3.0a1~1449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d3579b7d68816dc35da47a6a972e57f6c936dea;p=thirdparty%2FPython%2Fcpython.git

Remove now useless redefinition of chr/ord for narrow builds in test_multibytecodec_support.py.
---

diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py
index ef63b6934d58..ac3b92b6ee72 100644
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@ -264,21 +264,6 @@ class TestBase:
 
                 self.assertEqual(ostream.getvalue(), self.tstring[0])
 
-if len('\U00012345') == 2: # ucs2 build
-    _unichr = chr
-    def chr(v):
-        if v >= 0x10000:
-            return _unichr(0xd800 + ((v - 0x10000) >> 10)) + \
-                   _unichr(0xdc00 + ((v - 0x10000) & 0x3ff))
-        else:
-            return _unichr(v)
-    _ord = ord
-    def ord(c):
-        if len(c) == 2:
-            return 0x10000 + ((_ord(c[0]) - 0xd800) << 10) + \
-                          (ord(c[1]) - 0xdc00)
-        else:
-            return _ord(c)
 
 class TestBase_Mapping(unittest.TestCase):
     pass_enctest = []