mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix various spots where int/long and str/unicode unification

Browse source 
lead to type checks like isinstance(foo, (str, str)) or
isinstance(foo, (int, int)).
This commit is contained in:
Walter Dörwald 2007-05-03 21:05:51 +00:00
parent 5d7a7001d9
commit aa97f04964
14 changed files with 46 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/plat-mac/plistlib.py
View file

@ -70,7 +70,7 @@ def readPlist(pathOrFile):
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 @@ def writePlist(rootObject, pathOrFile):
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 @@ class PlistWriter(DumbXMLWriter):
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 @@ class PlistWriter(DumbXMLWriter):
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)