Support bytes in portage.util.normalize_path() with Python 3.

svn path=/main/trunk/; revision=14333

diff --git a/pym/portage/util.py b/pym/portage/util.py
index 5f1a42c2f13e6ddaefcbf2c0608d24d049b6adeb..ab70fd5c47a7eab4faab2e5cca3efac111df29f2 100644 (file)
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -104,9 +104,14 @@ def normalize_path(mypath):
        We dislike this behavior so we create our own normpath func
        to fix it.
        """
-       if mypath.startswith(os.path.sep):
+       if sys.hexversion >= 0x3000000 and isinstance(mypath, bytes):
+               path_sep = os.path.sep.encode()
+       else:
+               path_sep = os.path.sep
+
+       if mypath.startswith(path_sep):
                # posixpath.normpath collapses 3 or more leading slashes to just 1.
-               return os.path.normpath(2*os.path.sep + mypath)
+               return os.path.normpath(2*path_sep + mypath)
        else:
                return os.path.normpath(mypath)