Drop python-2.5 and remove 2.4,2.5 support codes

1 files changed, 6 insertions, 4 deletions

diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index 87717771a..e8655fe1f 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -69,6 +69,10 @@ def ensuredir(path):
             raise
 
 
+# TODO: This function can be removed because this function is same as os.walk
+# of Python2.6, 2.7, 3.1, 3.2, 3.3.
+# HOWEVER, this function is customized to check UnicodeError that obstacle to
+# replace the function with the os.walk.
 def walk(top, topdown=True, followlinks=False):
     """Backport of os.walk from 2.6, where the *followlinks* argument was
     added.
@@ -155,9 +159,8 @@ else:
 
 
 def safe_relpath(path, start=None):
-    from sphinx.util.pycompat import relpath
     try:
-        return relpath(path, start)
+        return os.path.relpath(path, start)
     except ValueError:
         return path
 
@@ -171,14 +174,13 @@ def find_catalog(docname, compaction):
 
 
 def find_catalog_files(docname, srcdir, locale_dirs, lang, compaction):
-    from sphinx.util.pycompat import relpath
     if not(lang and locale_dirs):
         return []
 
     domain = find_catalog(docname, compaction)
     files = [gettext.find(domain, path.join(srcdir, dir_), [lang])
              for dir_ in locale_dirs]
-    files = [relpath(f, srcdir) for f in files if f]
+    files = [path.relpath(f, srcdir) for f in files if f]
     return files