Minor patch of normalizePath()

This commit is contained in:
Miroslav Stampar
2017-11-02 13:09:31 +01:00
parent cdd0e6f0ac
commit c671acb62e
3 changed files with 331 additions and 329 deletions

View File

@@ -1727,14 +1727,14 @@ def normalizePath(filepath):
Returns normalized string representation of a given filepath
>>> normalizePath('//var///log/apache.log')
'//var/log/apache.log'
'/var/log/apache.log'
"""
retVal = filepath
if retVal:
retVal = retVal.strip("\r\n")
retVal = ntpath.normpath(retVal) if isWindowsDriveLetterPath(retVal) else posixpath.normpath(retVal)
retVal = ntpath.normpath(retVal) if isWindowsDriveLetterPath(retVal) else re.sub(r"\A/{2,}", "/", posixpath.normpath(retVal))
return retVal