From 1422e9dc60bd795b0bf8d8877087ce1eb6ad6942 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sat, 15 Dec 2001 22:12:47 +0000
Subject: 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.]
"""
---
 Lib/plat-riscos/riscospath.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Lib/plat-riscos')

diff --git a/Lib/plat-riscos/riscospath.py b/Lib/plat-riscos/riscospath.py
index fb0e477e76..30c0c9fe51 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
-- 
cgit v1.2.1