mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-30427: eliminate redundant type checks in os.path.normcase() (GH-1712) 

https://bugs.python.org/issue30427
This commit is contained in:
Wolfgang Maier 2019-03-28 22:47:18 +01:00 committed by Miss Islington (bot)
parent 02b84cb1b4
commit 74510e2a57
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/ntpath.py
View File

@ -46,16 +46,10 @@ def normcase(s):
Makes all characters lowercase and all slashes into backslashes.""" Makes all characters lowercase and all slashes into backslashes."""
s = os.fspath(s) s = os.fspath(s)
try: if isinstance(s, bytes):
if isinstance(s, bytes): return s.replace(b'/', b'\\').lower()
return s.replace(b'/', b'\\').lower() else:
else: return s.replace('/', '\\').lower()
return s.replace('/', '\\').lower()
except (TypeError, AttributeError):
if not isinstance(s, (bytes, str)):
raise TypeError("normcase() argument must be str or bytes, "
"not %r" % s.__class__.__name__) from None
raise
# Return whether a path is absolute. # Return whether a path is absolute.

6
Lib/posixpath.py
View File

@ -51,11 +51,7 @@ def _get_sep(path):
def normcase(s): def normcase(s):
"""Normalize case of pathname. Has no effect under Posix""" """Normalize case of pathname. Has no effect under Posix"""
s = os.fspath(s) return os.fspath(s)
if not isinstance(s, (bytes, str)):
raise TypeError("normcase() argument must be str or bytes, "
"not '{}'".format(s.__class__.__name__))
return s
# Return whether a path is absolute. # Return whether a path is absolute.

2
Misc/NEWS.d/next/Library/2019-03-28-21-17-08.bpo-30427.lxzvbw.rst Normal file
View File

@ -0,0 +1,2 @@
``os.path.normcase()`` relies on ``os.fspath()`` to check the type of its argument. Redundant checks have been removed from its ``posixpath.normcase()`` and ``ntpath.normcase()`` implementations.
Patch by Wolfgang Maier.