diff options
author | Walter Dörwald <walter@livinglogic.de> | 2002-06-06 09:48:13 (GMT) |
---|---|---|
committer | Walter Dörwald <walter@livinglogic.de> | 2002-06-06 09:48:13 (GMT) |
commit | 294bbf3a59255119cc4de3f85762ce47cd1d09e3 (patch) | |
tree | 4a3d57d008fc1cfe4c1ebdecc91e45f48d6cba35 | |
parent | c2009a86667a4f9837a1c8fce7ab438297e93f70 (diff) | |
download | cpython-294bbf3a59255119cc4de3f85762ce47cd1d09e3.zip cpython-294bbf3a59255119cc4de3f85762ce47cd1d09e3.tar.gz cpython-294bbf3a59255119cc4de3f85762ce47cd1d09e3.tar.bz2 |
Replace obsolete stat module constants with
equivalent attributes in a few more spots.
This closes SF patch http://www.python.org/sf/562373
-rw-r--r-- | Lib/fileinput.py | 4 | ||||
-rw-r--r-- | Lib/shutil.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Lib/fileinput.py b/Lib/fileinput.py index 5626ee8..d45aeca 100644 --- a/Lib/fileinput.py +++ b/Lib/fileinput.py @@ -79,7 +79,7 @@ XXX Possible additions: """ -import sys, os, stat +import sys, os __all__ = ["input","close","nextfile","filename","lineno","filelineno", "isfirstline","isstdin","FileInput"] @@ -300,7 +300,7 @@ class FileInput: os.rename(self._filename, self._backupfilename) self._file = open(self._backupfilename, "r") try: - perm = os.fstat(self._file.fileno())[stat.ST_MODE] + perm = os.fstat(self._file.fileno()).st_mode except: self._output = open(self._filename, "w") else: diff --git a/Lib/shutil.py b/Lib/shutil.py index 4340127..3076be9 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -38,15 +38,15 @@ def copymode(src, dst): """Copy mode bits from src to dst""" if hasattr(os, 'chmod'): st = os.stat(src) - mode = stat.S_IMODE(st[stat.ST_MODE]) + mode = stat.S_IMODE(st.st_mode) os.chmod(dst, mode) def copystat(src, dst): """Copy all stat info (mode bits, atime and mtime) from src to dst""" st = os.stat(src) - mode = stat.S_IMODE(st[stat.ST_MODE]) + mode = stat.S_IMODE(st.st_mode) if hasattr(os, 'utime'): - os.utime(dst, (st[stat.ST_ATIME], st[stat.ST_MTIME])) + os.utime(dst, (st.st_atime, st.st_mtime)) if hasattr(os, 'chmod'): os.chmod(dst, mode) |