diff options
| -rw-r--r-- | Lib/tarfile.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_fileio.py | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 39dc1f1..427f132 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -40,6 +40,7 @@ __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend." #--------- import sys import os +import io import shutil import stat import time @@ -833,20 +834,20 @@ class ExFileObject(object): return self.position - def seek(self, pos, whence=os.SEEK_SET): + def seek(self, pos, whence=io.SEEK_SET): """Seek to a position in the file. """ if self.closed: raise ValueError("I/O operation on closed file") - if whence == os.SEEK_SET: + if whence == io.SEEK_SET: self.position = min(max(pos, 0), self.size) - elif whence == os.SEEK_CUR: + elif whence == io.SEEK_CUR: if pos < 0: self.position = max(self.position + pos, 0) else: self.position = min(self.position + pos, self.size) - elif whence == os.SEEK_END: + elif whence == io.SEEK_END: self.position = max(min(self.size + pos, self.size), 0) else: raise ValueError("Invalid argument") diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 103365d..75db82c 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -2,6 +2,7 @@ import sys import os +import io import errno import unittest from array import array @@ -334,10 +335,10 @@ class OtherFileTests(unittest.TestCase): self.assertEqual(f.tell(), 10) f.truncate(5) self.assertEqual(f.tell(), 10) - self.assertEqual(f.seek(0, os.SEEK_END), 5) + self.assertEqual(f.seek(0, io.SEEK_END), 5) f.truncate(15) self.assertEqual(f.tell(), 5) - self.assertEqual(f.seek(0, os.SEEK_END), 15) + self.assertEqual(f.seek(0, io.SEEK_END), 15) f.close() def testTruncateOnWindows(self): |