Clearly distinguish the multiple "path_util" modules in use.

This revises r3257 as per suggestion from pamg (and brings that Windows fix to the Mac version).

Review URL: http://codereview.chromium.org/7422


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3467 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 6 deletions

diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py
index 36ba817..e51611a 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py
@@ -12,7 +12,8 @@ import sys
 
 import google.path_utils
 
-import layout_package.path_utils
+# Distinguish the path_utils.py in this dir from google.path_utils.
+import path_utils as layout_package_path_utils
 
 # This will be a native path to the directory this file resides in.
 # It can either be relative or absolute depending how it's executed.
@@ -61,7 +62,7 @@ class PlatformUtility(object):
     return "file:///" + self.GetAbsolutePath(path)
 
   def FilenameToUri(self, full_path):
-    relative_path = layout_package.path_utils.RelativeTestFilename(full_path)
+    relative_path = layout_package_path_utils.RelativeTestFilename(full_path)
     port = None
     use_ssl = False
 
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_win.py b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
index 55ed733..305141c 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
@@ -12,7 +12,6 @@ to fall back to the base functions.
 """
 
 import os
-import path_utils
 import re
 import subprocess
 
@@ -20,6 +19,9 @@ import google.httpd_utils
 import google.path_utils
 import google.platform_utils_win
 
+# Distinguish the path_utils.py in this dir from google.path_utils.
+import path_utils as layout_package_path_utils
+
 # This will be a native path to the directory this file resides in.
 # It can either be relative or absolute depending how it's executed.
 THISDIR = os.path.dirname(os.path.abspath(__file__))
@@ -33,7 +35,7 @@ class PlatformUtility(google.platform_utils_win.PlatformUtility):
   PENDING_HTTP_DIR    = "pending/http/tests/"
 
   def FilenameToUri(self, full_path):
-    relative_path = path_utils.RelativeTestFilename(full_path)
+    relative_path = layout_package_path_utils.RelativeTestFilename(full_path)
     port = None
     use_ssl = False
 
@@ -68,7 +70,7 @@ class PlatformUtility(google.platform_utils_win.PlatformUtility):
   def KillAllTestShells(self):
     """Kills all instances of the test_shell binary currently running."""
     subprocess.Popen(('taskkill.exe', '/f', '/im',
-                      path_utils.TestShellBinary()),
+                      layout_package_path_utils.TestShellBinary()),
                      stdout=subprocess.PIPE,
                      stderr=subprocess.PIPE).wait()
 
@@ -106,7 +108,7 @@ class PlatformUtility(google.platform_utils_win.PlatformUtility):
                command for Apache 2.x instead of Apache 1.3.x
     """
     layout_dir = google.platform_utils_win.GetCygwinPath(
-        path_utils.LayoutDataDir())
+        layout_package_path_utils.LayoutDataDir())
     main_document_root = os.path.join(layout_dir, "LayoutTests",
                                       "http", "tests")
     pending_document_root = os.path.join(layout_dir, "pending",