1.1 --- a/tests/unicode.py Tue Jun 29 22:41:05 2021 +0200
1.2 +++ b/tests/unicode.py Tue Jun 29 23:50:13 2021 +0200
1.3 @@ -18,31 +18,31 @@
1.4 s2 = b"\xe6\xf8\xe5"
1.5 print "ISO-8859-15 values:"
1.6 print s2 # æøå
1.7 -print s2.__class__ # __builtins__.str.string
1.8 +print s2.__class__ # __builtins__.str.str
1.9 print len(s2) # 3
1.10
1.11 s3 = "\xe6\xf8\xe5"
1.12 print "ISO-8859-15 values:"
1.13 print s3 # æøå
1.14 -print s3.__class__ # __builtins__.str.string
1.15 +print s3.__class__ # __builtins__.str.str
1.16 print len(s3) # 3
1.17
1.18 s4 = b"\u00e6\u00f8\u00e5"
1.19 print "Untranslated values:"
1.20 print s4 # \u00e6\u00f8\u00e5
1.21 -print s4.__class__ # __builtins__.str.string
1.22 +print s4.__class__ # __builtins__.str.str
1.23 print len(s4) # 18
1.24
1.25 s5 = b"\346\370\345"
1.26 print "ISO-8859-15 values:"
1.27 print s5 # æøå
1.28 -print s5.__class__ # __builtins__.str.string
1.29 +print s5.__class__ # __builtins__.str.str
1.30 print len(s5) # 3
1.31
1.32 s6 = "\346\370\345"
1.33 print "ISO-8859-15 values:"
1.34 print s6 # æøå
1.35 -print s6.__class__ # __builtins__.str.string
1.36 +print s6.__class__ # __builtins__.str.str
1.37 print len(s6) # 3
1.38
1.39 s7 = r"\346\370\345"
1.40 @@ -98,7 +98,7 @@
1.41 u5 = "\u00e6\u00f8\u00e5"
1.42 print "Unicode values:"
1.43 print u5 # æøå
1.44 -print u5.__class__ # __builtins__.unicode.ut8string
1.45 +print u5.__class__ # __builtins__.unicode.unicode
1.46 print len(u5) # 3
1.47
1.48 # Test some untranslated values.
1.49 @@ -106,7 +106,7 @@
1.50 u6 = "\\u00e6\\u00f8\\u00e5"
1.51 print "Untranslated values:"
1.52 print u6 # \u00e6\u00f8\u00e5
1.53 -print u6.__class__ # __builtins__.unicode.ut8string
1.54 +print u6.__class__ # __builtins__.unicode.unicode
1.55 print len(u6) # 18
1.56
1.57 # Test Unicode values.
1.58 @@ -114,7 +114,7 @@
1.59 u7 = u"\346\370\345"
1.60 print "Unicode values:"
1.61 print u7 # æøå
1.62 -print u7.__class__ # __builtins__.unicode.ut8string
1.63 +print u7.__class__ # __builtins__.unicode.unicode
1.64 print len(u7) # 3
1.65
1.66 # Test Unicode values.
1.67 @@ -122,7 +122,7 @@
1.68 u8 = ur"\346\370\345"
1.69 print "Untranslated values:"
1.70 print u8 # \346\370\345
1.71 -print u8.__class__ # __builtins__.unicode.ut8string
1.72 +print u8.__class__ # __builtins__.unicode.unicode
1.73 print len(u8) # 12
1.74
1.75 # Test invalid sequences.
1.76 @@ -137,7 +137,7 @@
1.77 u10 = "\u00e6\xf8\u00e5"
1.78 print "ISO-8859-15 values:"
1.79 print u10 # \u00e6ø\u00e5
1.80 -print u10.__class__ # __builtins__.str.string
1.81 +print u10.__class__ # __builtins__.str.str
1.82 print len(u10) # 13
1.83
1.84 # Combine bytes and text.
1.85 @@ -146,7 +146,7 @@
1.86 su = s + u
1.87 print "ISO-8859-15 values:"
1.88 print su # ÆØÅæøå
1.89 -print su.__class__ # __builtins__.str.string
1.90 +print su.__class__ # __builtins__.str.str
1.91 print len(su) # 6
1.92
1.93 # Combine text and bytes.
1.94 @@ -155,7 +155,7 @@
1.95 us = u + s
1.96 print "ISO-8859-15 values:"
1.97 print us # æøåÆØÅ
1.98 -print us.__class__ # __builtins__.str.string
1.99 +print us.__class__ # __builtins__.str.str
1.100 print len(us) # 6
1.101
1.102 # Combine text and text.