Skip to content

Commit ef87d6e

Browse files
gvanrossumgvanrossum
committed
Rip out all the u"..." literals and calls to unicode().
1 parent 572dbf8 commit ef87d6e

File tree

200 files changed

+18059
-18059
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+18059
-18059
lines changed

‎Lib/HTMLParser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ def replaceEntities(s):
376376
# which is not part of HTML 4
377377
import htmlentitydefs
378378
if HTMLParser.entitydefs is None:
379-
entitydefs = HTMLParser.entitydefs = {'apos':u"'"}
379+
entitydefs = HTMLParser.entitydefs = {'apos':"'"}
380380
for k, v in htmlentitydefs.name2codepoint.items():
381381
entitydefs[k] = unichr(v)
382382
try:

‎Lib/codecs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ def reset(self):
589589
590590
"""
591591
self.bytebuffer = ""
592-
self.charbuffer = u""
592+
self.charbuffer = ""
593593
self.linebuffer = None
594594

595595
def seek(self, offset, whence=0):

‎Lib/compiler/transformer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ def decode_literal(self, lit):
740740
# hack... changes in compile.c:parsestr and
741741
# tokenizer.c must be reflected here.
742742
if self.encoding not in ['utf-8', 'iso-8859-1']:
743-
lit = unicode(lit, 'utf-8').encode(self.encoding)
743+
lit = str(lit, 'utf-8').encode(self.encoding)
744744
return eval("# coding: %s\n%s" % (self.encoding, lit))
745745
else:
746746
return eval(lit)
@@ -750,7 +750,7 @@ def atom_string(self, nodelist):
750750
for node in nodelist[1:]:
751751
k += self.decode_literal(node[1])
752752
if isinstance(k, bytes):
753-
return Bytes(str(k), lineno=nodelist[0][2])
753+
return Bytes(str(k), lineno=nodelist[0][2])
754754
return Const(k, lineno=nodelist[0][2])
755755

756756
def atom_ellipsis(self, nodelist):
@@ -825,7 +825,7 @@ def _simplearg(self, node):
825825
else:
826826
annotation = None
827827
return SimpleArg(name, annotation, lineno)
828-
828+
829829
def com_arglist(self, nodelist):
830830
# varargslist:
831831
# (fpdef ['=' test] ',')*

‎Lib/cookielib.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ def escape_path(path):
644644
# And here, kind of: draft-fielding-uri-rfc2396bis-03
645645
# (And in draft IRI specification: draft-duerst-iri-05)
646646
# (And here, for new URI schemes: RFC 2718)
647-
if isinstance(path, unicode):
647+
if isinstance(path, str):
648648
path = path.encode("utf-8")
649649
path = urllib.quote(path, HTTP_PATH_SAFE)
650650
path = ESCAPED_CHAR_RE.sub(uppercase_escaped_char, path)

‎Lib/copy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def _deepcopy_atomic(x, memo):
186186
pass
187187
d[str] = _deepcopy_atomic
188188
try:
189-
d[unicode] = _deepcopy_atomic
189+
d[str] = _deepcopy_atomic
190190
except NameError:
191191
pass
192192
try:

‎Lib/ctypes/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def create_string_buffer(init, size=None):
5959
create_string_buffer(anInteger) -> character array
6060
create_string_buffer(aString, anInteger) -> character array
6161
"""
62-
if isinstance(init, (str, unicode)):
62+
if isinstance(init, (str, str)):
6363
if size is None:
6464
size = len(init)+1
6565
buftype = c_char * size
@@ -281,7 +281,7 @@ def create_unicode_buffer(init, size=None):
281281
create_unicode_buffer(anInteger) -> character array
282282
create_unicode_buffer(aString, anInteger) -> character array
283283
"""
284-
if isinstance(init, (str, unicode)):
284+
if isinstance(init, (str, str)):
285285
if size is None:
286286
size = len(init)+1
287287
buftype = c_wchar * size

‎Lib/ctypes/macholib/dyld.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
def ensure_utf8(s):
3535
"""Not all of PyObjC and Python understand unicode paths very well yet"""
36-
if isinstance(s, unicode):
36+
if isinstance(s, str):
3737
return s.encode('utf8')
3838
return s
3939

‎Lib/ctypes/test/test_as_parameter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test_wchar_parm(self):
2424
return
2525
f = dll._testfunc_i_bhilfd
2626
f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double]
27-
result = f(self.wrap(1), self.wrap(u"x"), self.wrap(3), self.wrap(4), self.wrap(5.0), self.wrap(6.0))
27+
result = f(self.wrap(1), self.wrap("x"), self.wrap(3), self.wrap(4), self.wrap(5.0), self.wrap(6.0))
2828
self.failUnlessEqual(result, 139)
2929
self.failUnless(type(result), int)
3030

‎Lib/ctypes/test/test_buffers.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_buffer(self):
1717
self.failUnlessEqual(b[:], "abc\0")
1818

1919
def test_string_conversion(self):
20-
b = create_string_buffer(u"abc")
20+
b = create_string_buffer("abc")
2121
self.failUnlessEqual(len(b), 4) # trailing nul char
2222
self.failUnlessEqual(sizeof(b), 4 * sizeof(c_char))
2323
self.failUnless(type(b[0]) is str)
@@ -33,21 +33,21 @@ def test_unicode_buffer(self):
3333
b = create_unicode_buffer(32)
3434
self.failUnlessEqual(len(b), 32)
3535
self.failUnlessEqual(sizeof(b), 32 * sizeof(c_wchar))
36-
self.failUnless(type(b[0]) is unicode)
36+
self.failUnless(type(b[0]) is str)
3737

38-
b = create_unicode_buffer(u"abc")
38+
b = create_unicode_buffer("abc")
3939
self.failUnlessEqual(len(b), 4) # trailing nul char
4040
self.failUnlessEqual(sizeof(b), 4 * sizeof(c_wchar))
41-
self.failUnless(type(b[0]) is unicode)
42-
self.failUnlessEqual(b[0], u"a")
41+
self.failUnless(type(b[0]) is str)
42+
self.failUnlessEqual(b[0], "a")
4343
self.failUnlessEqual(b[:], "abc\0")
4444

4545
def test_unicode_conversion(self):
4646
b = create_unicode_buffer("abc")
4747
self.failUnlessEqual(len(b), 4) # trailing nul char
4848
self.failUnlessEqual(sizeof(b), 4 * sizeof(c_wchar))
49-
self.failUnless(type(b[0]) is unicode)
50-
self.failUnlessEqual(b[0], u"a")
49+
self.failUnless(type(b[0]) is str)
50+
self.failUnlessEqual(b[0], "a")
5151
self.failUnlessEqual(b[:], "abc\0")
5252

5353
if __name__ == "__main__":

‎Lib/ctypes/test/test_functions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_wchar_parm(self):
7070
return
7171
f = dll._testfunc_i_bhilfd
7272
f.argtypes = [c_byte, c_wchar, c_int, c_long, c_float, c_double]
73-
result = f(1, u"x", 3, 4, 5.0, 6.0)
73+
result = f(1, "x", 3, 4, 5.0, 6.0)
7474
self.failUnlessEqual(result, 139)
7575
self.failUnlessEqual(type(result), int)
7676

@@ -83,7 +83,7 @@ def test_wchar_result(self):
8383
f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double]
8484
f.restype = c_wchar
8585
result = f(0, 0, 0, 0, 0, 0)
86-
self.failUnlessEqual(result, u'\x00')
86+
self.failUnlessEqual(result, '\x00')
8787

8888
def test_voidresult(self):
8989
f = dll._testfunc_v

0 commit comments

Comments
 (0)