Fix various spots where int/long and str/unicode unification
lead to type checks like isinstance(foo, (str, str)) or
isinstance(foo, (int, int)).
diff --git a/Lib/plat-mac/EasyDialogs.py b/Lib/plat-mac/EasyDialogs.py
index 6d157f9..dfed24f 100644
--- a/Lib/plat-mac/EasyDialogs.py
+++ b/Lib/plat-mac/EasyDialogs.py
@@ -713,7 +713,7 @@
raise TypeError, "Cannot pass wanted=FSRef to AskFileForSave"
if issubclass(tpwanted, Carbon.File.FSSpec):
return tpwanted(rr.selection[0])
- if issubclass(tpwanted, (str, str)):
+ if issubclass(tpwanted, str):
if sys.platform == 'mac':
fullpath = rr.selection[0].as_pathname()
else:
diff --git a/Lib/plat-mac/plistlib.py b/Lib/plat-mac/plistlib.py
index b040237..049b50b 100644
--- a/Lib/plat-mac/plistlib.py
+++ b/Lib/plat-mac/plistlib.py
@@ -70,7 +70,7 @@
usually is a dictionary).
"""
didOpen = 0
- if isinstance(pathOrFile, (str, str)):
+ if isinstance(pathOrFile, str):
pathOrFile = open(pathOrFile)
didOpen = 1
p = PlistParser()
@@ -85,7 +85,7 @@
file name or a (writable) file object.
"""
didOpen = 0
- if isinstance(pathOrFile, (str, str)):
+ if isinstance(pathOrFile, str):
pathOrFile = open(pathOrFile, "w")
didOpen = 1
writer = PlistWriter(pathOrFile)
@@ -231,7 +231,7 @@
DumbXMLWriter.__init__(self, file, indentLevel, indent)
def writeValue(self, value):
- if isinstance(value, (str, str)):
+ if isinstance(value, str):
self.simpleElement("string", value)
elif isinstance(value, bool):
# must switch for bool before int, as bool is a
@@ -270,7 +270,7 @@
self.beginElement("dict")
items = sorted(d.items())
for key, value in items:
- if not isinstance(key, (str, str)):
+ if not isinstance(key, str):
raise TypeError("keys must be strings")
self.simpleElement("key", key)
self.writeValue(value)