From: Guido van Rossum <guido@python.org>
Date: Tue, 31 Mar 1992 19:05:44 +0000 (+0000)
Subject: mac -> os (can't this go now dircache is universal?)
X-Git-Tag: v0.9.8~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50399ae583a2b675ad5d38e77feb05372d63275d;p=thirdparty%2FPython%2Fcpython.git

mac -> os (can't this go now dircache is universal?)
---

diff --git a/Mac/Lib/maccache.py b/Mac/Lib/maccache.py
index 725f10ea9910..1e2b3d02b171 100644
--- a/Mac/Lib/maccache.py
+++ b/Mac/Lib/maccache.py
@@ -1,9 +1,9 @@
 # Module 'maccache'
 #
 # Maintain a cache of listdir(), isdir(), isfile() or exists() outcomes.
+# XXX Should merge with module statcache
 
-import mac
-import macpath
+import os
 
 
 # The cache.
@@ -15,7 +15,7 @@ cache = {}
 
 # Current working directory.
 #
-cwd = mac.getcwd()
+cwd = os.getcwd()
 
 
 # Constants.
@@ -25,14 +25,14 @@ FILE = 1
 LISTTYPE = type([])
 
 def _stat(name):
-	name = macpath.join(cwd, name)
+	name = os.path.join(cwd, name)
 	if cache.has_key(name):
 		return cache[name]
-	if macpath.isfile(name):
+	if os.path.isfile(name):
 		cache[name] = FILE
 		return FILE
 	try:
-		list = mac.listdir(name)
+		list = os.listdir(name)
 	except:
 		cache[name] = NONE
 		return NONE