From 0f80768e66d374de927e9859938b65a457890d8c Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 22 Apr 2010 16:35:22 +0000 Subject: [PATCH] Reverted --- lib/core/common.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index e24297f02..dabdf8833 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -310,7 +310,7 @@ def getDirs(webApi=None): if absFilePath: directory = directoryPath(absFilePath) if isWindowsPath(directory): - ntToPosixSlashes(directory) + directory = ntToPosixSlashes(directory) if directory == '/': continue directories.add(directory) @@ -980,10 +980,12 @@ def urlEncodeCookieValues(cookieStr): def directoryPath(path): retVal = None - if isWindowsDriveLetterPath(path): + + if isWindowsPath(path): retVal = ntpath.dirname(path) else: retVal = posixpath.dirname(path) + return retVal def normalizePath(path): @@ -992,7 +994,8 @@ def normalizePath(path): and ntToPosixSlashes() """ retVal = None - if isWindowsDriveLetterPath(path): + + if isWindowsPath(path): retVal = ntpath.normpath(path) else: retVal = posixpath.normpath(path)