Merged revisions 63339 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63339 | brett.cannon | 2008-05-15 17:37:42 -0700 (Thu, 15 May 2008) | 2 lines
Remove the last usage of statvfs in the stdlib.
........
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 5f23336..503244a 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -216,7 +216,6 @@
if not hasattr(os, "statvfs"):
return
- import statvfs
try:
result = os.statvfs(self.fname)
except OSError as e:
@@ -226,16 +225,13 @@
return
# Make sure direct access works
- self.assertEquals(result.f_bfree, result[statvfs.F_BFREE])
+ self.assertEquals(result.f_bfree, result[3])
- # Make sure all the attributes are there
- members = dir(result)
- for name in dir(statvfs):
- if name[:2] == 'F_':
- attr = name.lower()
- self.assertEquals(getattr(result, attr),
- result[getattr(statvfs, name)])
- self.assert_(attr in members)
+ # Make sure all the attributes are there.
+ members = ('bsize', 'frsize', 'blocks', 'bfree', 'bavail', 'files',
+ 'ffree', 'favail', 'flag', 'namemax')
+ for value, member in enumerate(members):
+ self.assertEquals(getattr(result, 'f_' + member), result[value])
# Make sure that assignment really fails
try: