summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/cmp.py4
-rw-r--r--Lib/cmpcache.py4
-rwxr-xr-xLib/irix5/flp.py10
-rw-r--r--Lib/lib-stdwin/anywin.py4
-rw-r--r--Lib/lib-stdwin/dirwin.py8
-rwxr-xr-xLib/persist.py10
-rwxr-xr-xLib/plat-irix5/flp.py10
-rw-r--r--Lib/statcache.py8
-rwxr-xr-xLib/stdwin/anywin.py4
-rwxr-xr-xLib/stdwin/dirwin.py8
10 files changed, 35 insertions, 35 deletions
diff --git a/Lib/cmp.py b/Lib/cmp.py
index 1b48c67..a73b795 100644
--- a/Lib/cmp.py
+++ b/Lib/cmp.py
@@ -8,14 +8,14 @@
# - We keep a cache of outcomes of earlier comparisons
# - We don't fork a process to run 'cmp' but read the files ourselves
-import posix
+import os
cache = {}
def cmp(f1, f2): # Compare two files, use the cache if possible.
# Return 1 for identical files, 0 for different.
# Raise exceptions if either file could not be statted, read, etc.
- s1, s2 = sig(posix.stat(f1)), sig(posix.stat(f2))
+ s1, s2 = sig(os.stat(f1)), sig(os.stat(f2))
if s1[0] <> 8 or s2[0] <> 8:
# Either is a not a plain file -- always report as different
return 0
diff --git a/Lib/cmpcache.py b/Lib/cmpcache.py
index 20202e2..d59fa60 100644
--- a/Lib/cmpcache.py
+++ b/Lib/cmpcache.py
@@ -9,7 +9,7 @@
# - We keep a cache of outcomes of earlier comparisons
# - We don't fork a process to run 'cmp' but read the files ourselves
-import posix
+import os
from stat import *
import statcache
@@ -20,7 +20,7 @@ cache = {}
# Compare two files, use the cache if possible.
-# May raise posix.error if a stat or open of either fails.
+# May raise os.error if a stat or open of either fails.
#
def cmp(f1, f2):
# Return 1 for identical files, 0 for different.
diff --git a/Lib/irix5/flp.py b/Lib/irix5/flp.py
index e6608f8..fcc95f0 100755
--- a/Lib/irix5/flp.py
+++ b/Lib/irix5/flp.py
@@ -4,7 +4,7 @@
# Jack Jansen, December 1991
#
import string
-import path
+import os
import sys
import FL
@@ -106,11 +106,11 @@ def wrlong(fp, x):
fp.write(chr(a) + chr(b) + chr(c) + chr(d))
def getmtime(filename):
- import posix
+ import os
from stat import ST_MTIME
try:
- return posix.stat(filename)[ST_MTIME]
- except posix.error:
+ return os.stat(filename)[ST_MTIME]
+ except os.error:
return None
#
@@ -157,7 +157,7 @@ def _open_formfile2(filename):
fp = None
else:
for pc in sys.path:
- pn = path.join(pc, filename)
+ pn = os.path.join(pc, filename)
try:
fp = open(pn, 'r')
filename = pn
diff --git a/Lib/lib-stdwin/anywin.py b/Lib/lib-stdwin/anywin.py
index bb7e865..38ee869 100644
--- a/Lib/lib-stdwin/anywin.py
+++ b/Lib/lib-stdwin/anywin.py
@@ -3,11 +3,11 @@
import dirwin
import filewin
-import path
+import os
def open(name):
print 'opening', name, '...'
- if path.isdir(name):
+ if os.path.isdir(name):
w = dirwin.open(name)
else:
w = filewin.open(name)
diff --git a/Lib/lib-stdwin/dirwin.py b/Lib/lib-stdwin/dirwin.py
index beb5222..e8b0170 100644
--- a/Lib/lib-stdwin/dirwin.py
+++ b/Lib/lib-stdwin/dirwin.py
@@ -2,24 +2,24 @@
# Directory windows, a subclass of listwin
+import os
import gwin
import listwin
import anywin
-import path
import dircache
def action(w, string, i, detail):
(h, v), clicks, button, mask = detail
if clicks == 2:
- name = path.join(w.name, string)
+ name = os.path.join(w.name, string)
try:
w2 = anywin.open(name)
w2.parent = w
- except posix.error, why:
+ except os.error, why:
stdwin.message('Can\'t open ' + name + ': ' + why[1])
def open(name):
- name = path.join(name, '')
+ name = os.path.join(name, '')
list = dircache.opendir(name)[:]
list.sort()
dircache.annotate(name, list)
diff --git a/Lib/persist.py b/Lib/persist.py
index 52cc6fb..ae7d58b 100755
--- a/Lib/persist.py
+++ b/Lib/persist.py
@@ -32,16 +32,16 @@ defaultfile = 'wsrestore.py'
def save():
import __main__
- import posix
+ import os
# XXX On SYSV, if len(defaultfile) >= 14, this is wrong!
backup = defaultfile + '~'
try:
- posix.unlink(backup)
- except posix.error:
+ os.unlink(backup)
+ except os.error:
pass
try:
- posix.rename(defaultfile, backup)
- except posix.error:
+ os.rename(defaultfile, backup)
+ except os.error:
pass
fp = open(defaultfile, 'w')
writedict(__main__.__dict__, fp)
diff --git a/Lib/plat-irix5/flp.py b/Lib/plat-irix5/flp.py
index e6608f8..fcc95f0 100755
--- a/Lib/plat-irix5/flp.py
+++ b/Lib/plat-irix5/flp.py
@@ -4,7 +4,7 @@
# Jack Jansen, December 1991
#
import string
-import path
+import os
import sys
import FL
@@ -106,11 +106,11 @@ def wrlong(fp, x):
fp.write(chr(a) + chr(b) + chr(c) + chr(d))
def getmtime(filename):
- import posix
+ import os
from stat import ST_MTIME
try:
- return posix.stat(filename)[ST_MTIME]
- except posix.error:
+ return os.stat(filename)[ST_MTIME]
+ except os.error:
return None
#
@@ -157,7 +157,7 @@ def _open_formfile2(filename):
fp = None
else:
for pc in sys.path:
- pn = path.join(pc, filename)
+ pn = os.path.join(pc, filename)
try:
fp = open(pn, 'r')
filename = pn
diff --git a/Lib/statcache.py b/Lib/statcache.py
index bf13eb5..04381f3 100644
--- a/Lib/statcache.py
+++ b/Lib/statcache.py
@@ -3,11 +3,11 @@
# Maintain a cache of file stats.
# There are functions to reset the cache or to selectively remove items.
-import posix
+import os
from stat import *
# The cache.
-# Keys are pathnames, values are `posix.stat' outcomes.
+# Keys are pathnames, values are `os.stat' outcomes.
#
cache = {}
@@ -17,7 +17,7 @@ cache = {}
def stat(path):
if cache.has_key(path):
return cache[path]
- cache[path] = ret = posix.stat(path)
+ cache[path] = ret = os.stat(path)
return ret
@@ -81,6 +81,6 @@ def forget_except_prefix(prefix):
def isdir(path):
try:
st = stat(path)
- except posix.error:
+ except os.error:
return 0
return S_ISDIR(st[ST_MODE])
diff --git a/Lib/stdwin/anywin.py b/Lib/stdwin/anywin.py
index bb7e865..38ee869 100755
--- a/Lib/stdwin/anywin.py
+++ b/Lib/stdwin/anywin.py
@@ -3,11 +3,11 @@
import dirwin
import filewin
-import path
+import os
def open(name):
print 'opening', name, '...'
- if path.isdir(name):
+ if os.path.isdir(name):
w = dirwin.open(name)
else:
w = filewin.open(name)
diff --git a/Lib/stdwin/dirwin.py b/Lib/stdwin/dirwin.py
index beb5222..e8b0170 100755
--- a/Lib/stdwin/dirwin.py
+++ b/Lib/stdwin/dirwin.py
@@ -2,24 +2,24 @@
# Directory windows, a subclass of listwin
+import os
import gwin
import listwin
import anywin
-import path
import dircache
def action(w, string, i, detail):
(h, v), clicks, button, mask = detail
if clicks == 2:
- name = path.join(w.name, string)
+ name = os.path.join(w.name, string)
try:
w2 = anywin.open(name)
w2.parent = w
- except posix.error, why:
+ except os.error, why:
stdwin.message('Can\'t open ' + name + ': ' + why[1])
def open(name):
- name = path.join(name, '')
+ name = os.path.join(name, '')
list = dircache.opendir(name)[:]
list.sort()
dircache.annotate(name, list)