diff options
Diffstat (limited to 'Tools/pybench/Unicode.py')
| -rw-r--r-- | Tools/pybench/Unicode.py | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/Tools/pybench/Unicode.py b/Tools/pybench/Unicode.py index 153a91e..b17a7c3 100644 --- a/Tools/pybench/Unicode.py +++ b/Tools/pybench/Unicode.py @@ -4,7 +4,6 @@ except NameError: raise ImportError from pybench import Test -from string import join class ConcatUnicode(Test): @@ -15,10 +14,10 @@ class ConcatUnicode(Test): def test(self): # Make sure the strings are *not* interned - s = unicode(join(map(str,range(100)))) - t = unicode(join(map(str,range(1,101)))) + s = unicode(u''.join(map(str,range(100)))) + t = unicode(u''.join(map(str,range(1,101)))) - for i in xrange(self.rounds): + for i in range(self.rounds): t + s t + s t + s @@ -81,10 +80,10 @@ class ConcatUnicode(Test): def calibrate(self): - s = unicode(join(map(str,range(100)))) - t = unicode(join(map(str,range(1,101)))) + s = unicode(u''.join(map(str,range(100)))) + t = unicode(u''.join(map(str,range(1,101)))) - for i in xrange(self.rounds): + for i in range(self.rounds): pass @@ -97,10 +96,10 @@ class CompareUnicode(Test): def test(self): # Make sure the strings are *not* interned - s = unicode(join(map(str,range(10)))) - t = unicode(join(map(str,range(10))) + "abc") + s = unicode(u''.join(map(str,range(10)))) + t = unicode(u''.join(map(str,range(10))) + "abc") - for i in xrange(self.rounds): + for i in range(self.rounds): t < s t > s t == s @@ -163,10 +162,10 @@ class CompareUnicode(Test): def calibrate(self): - s = unicode(join(map(str,range(10)))) - t = unicode(join(map(str,range(10))) + "abc") + s = unicode(u''.join(map(str,range(10)))) + t = unicode(u''.join(map(str,range(10))) + "abc") - for i in xrange(self.rounds): + for i in range(self.rounds): pass @@ -178,7 +177,7 @@ class CreateUnicodeWithConcat(Test): def test(self): - for i in xrange(self.rounds): + for i in range(self.rounds): s = u'om' s = s + u'xbx' s = s + u'xcx' @@ -241,7 +240,7 @@ class CreateUnicodeWithConcat(Test): def calibrate(self): - for i in xrange(self.rounds): + for i in range(self.rounds): pass @@ -253,9 +252,9 @@ class UnicodeSlicing(Test): def test(self): - s = unicode(join(map(str,range(100)))) + s = unicode(u''.join(map(str,range(100)))) - for i in xrange(self.rounds): + for i in range(self.rounds): s[50:] s[:25] @@ -299,9 +298,9 @@ class UnicodeSlicing(Test): def calibrate(self): - s = unicode(join(map(str,range(100)))) + s = unicode(u''.join(map(str,range(100)))) - for i in xrange(self.rounds): + for i in range(self.rounds): pass ### String methods @@ -314,12 +313,12 @@ class UnicodeMappings(Test): def test(self): - s = join(map(unichr,range(20)),'') - t = join(map(unichr,range(100)),'') - u = join(map(unichr,range(500)),'') - v = join(map(unichr,range(1000)),'') + s = u''.join(map(unichr,range(20))) + t = u''.join(map(unichr,range(100))) + u = u''.join(map(unichr,range(500))) + v = u''.join(map(unichr,range(1000))) - for i in xrange(self.rounds): + for i in range(self.rounds): s.lower() s.lower() @@ -371,12 +370,12 @@ class UnicodeMappings(Test): def calibrate(self): - s = join(map(unichr,range(20)),'') - t = join(map(unichr,range(100)),'') - u = join(map(unichr,range(500)),'') - v = join(map(unichr,range(1000)),'') + s = u''.join(map(unichr,range(20))) + t = u''.join(map(unichr,range(100))) + u = u''.join(map(unichr,range(500))) + v = u''.join(map(unichr,range(1000))) - for i in xrange(self.rounds): + for i in range(self.rounds): pass class UnicodePredicates(Test): @@ -390,7 +389,7 @@ class UnicodePredicates(Test): data = (u'abc', u'123', u' ', u'\u1234\u2345\u3456', u'\uFFFF'*10) len_data = len(data) - for i in xrange(self.rounds): + for i in range(self.rounds): s = data[i % len_data] s.isalnum() @@ -448,7 +447,7 @@ class UnicodePredicates(Test): data = (u'abc', u'123', u' ', u'\u1234\u2345\u3456', u'\uFFFF'*10) len_data = len(data) - for i in xrange(self.rounds): + for i in range(self.rounds): s = data[i % len_data] try: @@ -475,7 +474,7 @@ else: mirrored = unicodedata.mirrored combining = unicodedata.combining - for i in xrange(self.rounds): + for i in range(self.rounds): c = data[i % len_data] @@ -537,6 +536,6 @@ else: mirrored = unicodedata.mirrored combining = unicodedata.combining - for i in xrange(self.rounds): + for i in range(self.rounds): c = data[i % len_data] |