mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

use io.SEEK_* constants instead of os.SEEK_* where an IO stream is seeked, leaving the os.SEEK_* constants only for os.lseek, as documented

Browse source
This commit is contained in:
Eli Bendersky 2012-01-03 06:26:13 +02:00
parent c041ab6c7d
commit 74c503b40d
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/tarfile.py
View file

@ -40,6 +40,7 @@ __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend."
#--------- #---------
import sys import sys
import os import os
import io
import shutil import shutil
import stat import stat
import time import time
@ -833,20 +834,20 @@ class ExFileObject(object):
return self.position 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. """Seek to a position in the file.
""" """
if self.closed: if self.closed:
raise ValueError("I/O operation on closed file") 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) self.position = min(max(pos, 0), self.size)
elif whence == os.SEEK_CUR: elif whence == io.SEEK_CUR:
if pos < 0: if pos < 0:
self.position = max(self.position + pos, 0) self.position = max(self.position + pos, 0)
else: else:
self.position = min(self.position + pos, self.size) 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) self.position = max(min(self.size + pos, self.size), 0)
else: else:
raise ValueError("Invalid argument") raise ValueError("Invalid argument")

5
Lib/test/test_fileio.py
View file

@ -2,6 +2,7 @@
import sys import sys
import os import os
import io
import errno import errno
import unittest import unittest
from array import array from array import array
@ -334,10 +335,10 @@ class OtherFileTests(unittest.TestCase):
self.assertEqual(f.tell(), 10) self.assertEqual(f.tell(), 10)
f.truncate(5) f.truncate(5)
self.assertEqual(f.tell(), 10) 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) f.truncate(15)
self.assertEqual(f.tell(), 5) 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() f.close()
def testTruncateOnWindows(self): def testTruncateOnWindows(self):