summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-12-15 22:12:47 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-12-15 22:12:47 (GMT)
commit1422e9dc60bd795b0bf8d8877087ce1eb6ad6942 (patch)
tree161121ac48bd430596a23e4f170617c31b3a05fd /Lib
parentc57772870b3e3399a6d8d03a75113987fbfab4b0 (diff)
downloadcpython-1422e9dc60bd795b0bf8d8877087ce1eb6ad6942.zip
cpython-1422e9dc60bd795b0bf8d8877087ce1eb6ad6942.tar.gz
cpython-1422e9dc60bd795b0bf8d8877087ce1eb6ad6942.tar.bz2
SF patch 493739 2 Bugfixes for 2.2c1 (RISC OS specific), from
Dietmar Schwertberger. Bugfix candidate. """ RISCOS/Modules/getpath_riscos.c: Include trailing '\0' when using strncpy [copy strlen(...)+1 characters]. Lib/plat-riscos/riscospath.py: Use riscosmodule.expand for os.path.abspath. [fixes problems with site.py where abspath("<Python$Dir>") returned join(os.getcwd(), "<Python$Dir>") as e.g. "SCSI::SCSI4.$.<Python$Dir>" because "<Python$Dir>" wasn't recognised as an absolute path.] """
Diffstat (limited to 'Lib')
-rw-r--r--Lib/plat-riscos/riscospath.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/plat-riscos/riscospath.py b/Lib/plat-riscos/riscospath.py
index fb0e477..30c0c9f 100644
--- a/Lib/plat-riscos/riscospath.py
+++ b/Lib/plat-riscos/riscospath.py
@@ -311,10 +311,8 @@ def expandvars(p):
return b.tostring(0, swi.swi('OS_GSTrans', 'sbi;..i', p, b, l))
-# Return an absolute path.
-
-def abspath(p):
- return normpath(join(os.getcwd(), p))
+# Return an absolute path. RISC OS' osfscontrol_canonicalise_path does this among others
+abspath = os.expand
# realpath is a no-op on systems without islink support