Changeset 107145 in webkit

Timestamp:

Feb 8, 2012 3:59:04 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Remove the ospath compat shim from webkitpy
​https://bugs.webkit.org/show_bug.cgi?id=78170

Reviewed by Eric Seidel.

We no longer need this compat shim now that we don't support Python 2.5.

• Scripts/webkitpy/common/checkout/scm/git.py:
• Scripts/webkitpy/common/checkout/scm/svn.py:
• Scripts/webkitpy/common/system/filesystem.py:

(FileSystem.relpath):

• Scripts/webkitpy/common/system/filesystem_mock.py:

(MockFileSystem.relpath):

• Scripts/webkitpy/common/system/ospath.py: Removed.
• Scripts/webkitpy/common/system/ospath_unittest.py: Removed.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/git.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/svn.py (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem.py (modified) (2 diffs)
• Scripts/webkitpy/common/system/filesystem_mock.py (modified) (2 diffs)
• Scripts/webkitpy/common/system/ospath.py (deleted)
• Scripts/webkitpy/common/system/ospath_unittest.py (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-08  Adam Barth  <abarth@webkit.org>
+
+        Remove the ospath compat shim from webkitpy
+        https://bugs.webkit.org/show_bug.cgi?id=78170
+
+        Reviewed by Eric Seidel.
+
+        We no longer need this compat shim now that we don't support Python 2.5.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        * Scripts/webkitpy/common/checkout/scm/svn.py:
+        * Scripts/webkitpy/common/system/filesystem.py:
+        (FileSystem.relpath):
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        (MockFileSystem.relpath):
+        * Scripts/webkitpy/common/system/ospath.py: Removed.
+        * Scripts/webkitpy/common/system/ospath_unittest.py: Removed.
+
 2012-02-08  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -35 +35 @@
 from webkitpy.common.system.deprecated_logging import log
 from webkitpy.common.system.executive import Executive, ScriptError
-from webkitpy.common.system import ospath
 
 from .commitmessage import CommitMessage

trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py

@@ -37 +37 @@
 from webkitpy.common.system.deprecated_logging import log
 from webkitpy.common.system.executive import Executive, ScriptError
-from webkitpy.common.system import ospath
 
 from .scm import AuthenticationError, SCM, commit_error_handler

trunk/Tools/Scripts/webkitpy/common/system/filesystem.py

@@ -40 +40 @@
 import time
 
-from webkitpy.common.system import ospath
-
 class FileSystem(object):
     """FileSystem interface for webkitpy.
@@ -228 +226 @@
 
     def relpath(self, path, start='.'):
-        return ospath.relpath(path, start)
+        return os.path.relpath(path, start)
 
     class _WindowsError(exceptions.OSError):

trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py

@@ -34 +34 @@
 
 from webkitpy.common.system import path
-from webkitpy.common.system import ospath
 
 
@@ -304 +303 @@
 
     def relpath(self, path, start='.'):
-        return ospath.relpath(path, start, self.abspath, self.sep)
+        # Since os.path.relpath() calls os.path.normpath()
+        # (see http://docs.python.org/library/os.path.html#os.path.abspath )
+        # it also removes trailing slashes and converts forward and backward
+        # slashes to the preferred slash os.sep.
+        start = self.abspath(start)
+        path = self.abspath(path)
+
+        if not path.lower().startswith(start.lower()):
+            # Then path is outside the directory given by start.
+            return None  # FIXME: os.relpath still returns a path here.
+
+        rel_path = path[len(start):]
+
+        if not rel_path:
+            # Then the paths are the same.
+            pass
+        elif rel_path[0] == self.sep:
+            # It is probably sufficient to remove just the first character
+            # since os.path.normpath() collapses separators, but we use
+            # lstrip() just to be sure.
+            rel_path = rel_path.lstrip(self.sep)
+        else:
+            # We are in the case typified by the following example:
+            # path = "/tmp/foobar", start = "/tmp/foo" -> rel_path = "bar"
+            return None
+
+        return rel_path
 
     def remove(self, path):