mirror of https://github.com/python/cpython.git
Instead of 'import mac', use 'import os' -- this way, the path syntax
manipulation routines can be used on non-Mac platforms (e.g. to manipulate pathnames in a Mac specific archive).
This commit is contained in:
parent
69f65801ab
commit
5c1d2297ea
|
@ -1,7 +1,7 @@
|
||||||
# module 'macpath' -- pathname (or -related) operations for the Macintosh
|
# module 'macpath' -- pathname (or -related) operations for the Macintosh
|
||||||
|
|
||||||
import string
|
import string
|
||||||
import mac
|
import os
|
||||||
from stat import *
|
from stat import *
|
||||||
|
|
||||||
|
|
||||||
|
@ -93,8 +93,8 @@ def basename(s): return split(s)[1]
|
||||||
|
|
||||||
def isdir(s):
|
def isdir(s):
|
||||||
try:
|
try:
|
||||||
st = mac.stat(s)
|
st = os.stat(s)
|
||||||
except mac.error:
|
except os.error:
|
||||||
return 0
|
return 0
|
||||||
return S_ISDIR(st[ST_MODE])
|
return S_ISDIR(st[ST_MODE])
|
||||||
|
|
||||||
|
@ -110,8 +110,8 @@ def islink(s):
|
||||||
|
|
||||||
def isfile(s):
|
def isfile(s):
|
||||||
try:
|
try:
|
||||||
st = mac.stat(s)
|
st = os.stat(s)
|
||||||
except mac.error:
|
except os.error:
|
||||||
return 0
|
return 0
|
||||||
return S_ISREG(st[ST_MODE])
|
return S_ISREG(st[ST_MODE])
|
||||||
|
|
||||||
|
@ -120,8 +120,8 @@ def isfile(s):
|
||||||
|
|
||||||
def exists(s):
|
def exists(s):
|
||||||
try:
|
try:
|
||||||
st = mac.stat(s)
|
st = os.stat(s)
|
||||||
except mac.error:
|
except os.error:
|
||||||
return 0
|
return 0
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@ -186,8 +186,8 @@ def normpath(s):
|
||||||
|
|
||||||
def walk(top, func, arg):
|
def walk(top, func, arg):
|
||||||
try:
|
try:
|
||||||
names = mac.listdir(top)
|
names = os.listdir(top)
|
||||||
except mac.error:
|
except os.error:
|
||||||
return
|
return
|
||||||
func(arg, top, names)
|
func(arg, top, names)
|
||||||
for name in names:
|
for name in names:
|
||||||
|
|
Loading…
Reference in New Issue