From: Neal Norwitz Date: Fri, 3 Jan 2003 18:01:57 +0000 (+0000) Subject: Fix SF #659228, 'realpath' function missing from os.path X-Git-Tag: v2.3c1~2621 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61cdac6d3d00b4a1b34c64b2fae0e1be10b5fdb4;p=thirdparty%2FPython%2Fcpython.git Fix SF #659228, 'realpath' function missing from os.path Also added realpath = abspath for os2emx, similar to windows/mac which also don't really implement realpath. Backport candidate, I think? --- diff --git a/Lib/macpath.py b/Lib/macpath.py index ba9d40b74361..e3145da12953 100644 --- a/Lib/macpath.py +++ b/Lib/macpath.py @@ -7,7 +7,7 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", "getatime","getctime", "islink","exists","isdir","isfile", "walk","expanduser","expandvars","normpath","abspath", - "supports_unicode_filenames"] + "realpath","supports_unicode_filenames"] # Normalize the case of a pathname. Dummy in Posix, but .lower() here. diff --git a/Lib/ntpath.py b/Lib/ntpath.py index d6b69208df4e..b82051424e28 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -13,7 +13,7 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", "getatime","getctime", "islink","exists","isdir","isfile","ismount", "walk","expanduser","expandvars","normpath","abspath","splitunc", - "supports_unicode_filenames"] + "realpath","supports_unicode_filenames"] # Normalize the case of a pathname and map slashes to backslashes. # Other normalizations (such as optimizing '../' away) are not done diff --git a/Lib/os2emxpath.py b/Lib/os2emxpath.py index 0315da027fa4..f92841fd5f9e 100644 --- a/Lib/os2emxpath.py +++ b/Lib/os2emxpath.py @@ -12,7 +12,7 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", "getatime","getctime", "islink","exists","isdir","isfile","ismount", "walk","expanduser","expandvars","normpath","abspath","splitunc", - "supports_unicode_filenames"] + "realpath","supports_unicode_filenames"] # Normalize the case of a pathname and map slashes to backslashes. # Other normalizations (such as optimizing '../' away) are not done @@ -405,4 +405,7 @@ def abspath(path): path = join(os.getcwd(), path) return normpath(path) +# realpath is a no-op on systems without islink support +realpath = abspath + supports_unicode_filenames = False diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 8da9fdaa8c21..d0179f112cbf 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -17,7 +17,8 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", "getatime","getctime","islink","exists","isdir","isfile","ismount", "walk","expanduser","expandvars","normpath","abspath", - "samefile","sameopenfile","samestat","supports_unicode_filenames"] + "samefile","sameopenfile","samestat", + "realpath","supports_unicode_filenames"] # Normalize the case of a pathname. Trivial in Posix, string.lower on Mac. # On MS-DOS this may also turn slashes into backslashes; however, other