mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

macpath.cat --> join

Browse source
This commit is contained in:
Guido van Rossum 1991-08-16 13:27:45 +00:00
parent 0b7448020a
commit fbe0a8e090
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/lib-old/packmail.py
View file

@ -21,7 +21,7 @@ def pack(outfp, file, name):
def packsome(outfp, dirname, names): def packsome(outfp, dirname, names):
for name in names: for name in names:
print name print name
file = macpath.cat(dirname, name) file = macpath.join(dirname, name)
pack(outfp, file, name) pack(outfp, file, name)
# Pack all files from a directory # Pack all files from a directory
@ -33,13 +33,13 @@ def packall(outfp, dirname):
# Pack all files from a directory that are not older than a give one # Pack all files from a directory that are not older than a give one
def packnotolder(outfp, dirname, oldest): def packnotolder(outfp, dirname, oldest):
names = mac.listdir(dirname) names = mac.listdir(dirname)
oldest = macpath.cat(dirname, oldest) oldest = macpath.join(dirname, oldest)
st = mac.stat(oldest) st = mac.stat(oldest)
mtime = st[ST_MTIME] mtime = st[ST_MTIME]
todo = [] todo = []
for name in names: for name in names:
print name, '...', print name, '...',
st = mac.stat(macpath.cat(dirname, name)) st = mac.stat(macpath.join(dirname, name))
if st[ST_MTIME] >= mtime: if st[ST_MTIME] >= mtime:
print 'Yes.' print 'Yes.'
todo.append(name) todo.append(name)
@ -55,7 +55,7 @@ def packtree(outfp, dirname):
names = mac.listdir(dirname) names = mac.listdir(dirname)
subdirs = [] subdirs = []
for name in names: for name in names:
fullname = macpath.cat(dirname, name) fullname = macpath.join(dirname, name)
if macpath.isdir(fullname): if macpath.isdir(fullname):
subdirs.append(fullname) subdirs.append(fullname)
else: else:

9
Lib/macpath.py
View file

@ -15,11 +15,11 @@ def isabs(s):
return ':' in s and s[0] <> ':' return ':' in s and s[0] <> ':'
# Concatenate two pathnames. # Join two pathnames.
# The result is equivalent to what the second pathname would refer to # The result is equivalent to what the second pathname would refer to
# if the first pathname were the current directory. # if the first pathname were the current directory.
def cat(s, t): def join(s, t):
if (not s) or isabs(t): return t if (not s) or isabs(t): return t
if t[:1] = ':': t = t[1:] if t[:1] = ':': t = t[1:]
if ':' not in s: if ':' not in s:
@ -29,9 +29,12 @@ def cat(s, t):
return s + t return s + t
cat = join # For compatibility
# Split a pathname in two parts: the directory leading up to the final bit, # Split a pathname in two parts: the directory leading up to the final bit,
# and the basename (the filename, without colons, in that directory). # and the basename (the filename, without colons, in that directory).
# The result (s, t) is such that cat(s, t) yields the original argument. # The result (s, t) is such that join(s, t) yields the original argument.
def split(s): def split(s):
if ':' not in s: return '', s if ':' not in s: return '', s

8
Lib/packmail.py
View file

@ -21,7 +21,7 @@ def pack(outfp, file, name):
def packsome(outfp, dirname, names): def packsome(outfp, dirname, names):
for name in names: for name in names:
print name print name
file = macpath.cat(dirname, name) file = macpath.join(dirname, name)
pack(outfp, file, name) pack(outfp, file, name)
# Pack all files from a directory # Pack all files from a directory
@ -33,13 +33,13 @@ def packall(outfp, dirname):
# Pack all files from a directory that are not older than a give one # Pack all files from a directory that are not older than a give one
def packnotolder(outfp, dirname, oldest): def packnotolder(outfp, dirname, oldest):
names = mac.listdir(dirname) names = mac.listdir(dirname)
oldest = macpath.cat(dirname, oldest) oldest = macpath.join(dirname, oldest)
st = mac.stat(oldest) st = mac.stat(oldest)
mtime = st[ST_MTIME] mtime = st[ST_MTIME]
todo = [] todo = []
for name in names: for name in names:
print name, '...', print name, '...',
st = mac.stat(macpath.cat(dirname, name)) st = mac.stat(macpath.join(dirname, name))
if st[ST_MTIME] >= mtime: if st[ST_MTIME] >= mtime:
print 'Yes.' print 'Yes.'
todo.append(name) todo.append(name)
@ -55,7 +55,7 @@ def packtree(outfp, dirname):
names = mac.listdir(dirname) names = mac.listdir(dirname)
subdirs = [] subdirs = []
for name in names: for name in names:
fullname = macpath.cat(dirname, name) fullname = macpath.join(dirname, name)
if macpath.isdir(fullname): if macpath.isdir(fullname):
subdirs.append(fullname) subdirs.append(fullname)
else: else:

2
Mac/Lib/maccache.py
View file

@ -25,7 +25,7 @@ FILE = 1
LISTTYPE = type([]) LISTTYPE = type([])
def _stat(name): def _stat(name):
name = macpath.cat(cwd, name) name = macpath.join(cwd, name)
if cache.has_key(name): if cache.has_key(name):
return cache[name] return cache[name]
if macpath.isfile(name): if macpath.isfile(name):