Rip out all the u"..." literals and calls to unicode().
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index 7fdcb70..b4b2840 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -431,7 +431,7 @@
raise ValueError("no newline found when trying to read "
"unicodestringnl")
data = data[:-1] # lose the newline
- return unicode(data, 'raw-unicode-escape')
+ return str(data, 'raw-unicode-escape')
unicodestringnl = ArgumentDescriptor(
name='unicodestringnl',
@@ -467,7 +467,7 @@
raise ValueError("unicodestring4 byte count < 0: %d" % n)
data = f.read(n)
if len(data) == n:
- return unicode(data, 'utf-8')
+ return str(data, 'utf-8')
raise ValueError("expected %d bytes in a unicodestring4, but only %d "
"remain" % (n, len(data)))
@@ -750,7 +750,7 @@
pyunicode = StackObject(
name='unicode',
- obtype=unicode,
+ obtype=str,
doc="A Python Unicode string object.")
pynone = StackObject(