Merged revisions 78757 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78757 | florent.xicluna | 2010-03-07 14:14:25 +0200 (Sun, 07 Mar 2010) | 2 lines
Fix some py3k warnings in the standard library.
........
diff --git a/Lib/io.py b/Lib/io.py
index 9013c58..40623d6 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -849,8 +849,8 @@
if self.closed:
raise ValueError("seek on closed file")
try:
- pos = pos.__index__()
- except AttributeError as err:
+ pos.__index__
+ except AttributeError:
raise TypeError("an integer is required") # from err
if whence == 0:
if pos < 0:
@@ -874,8 +874,13 @@
raise ValueError("truncate on closed file")
if pos is None:
pos = self._pos
- elif pos < 0:
- raise ValueError("negative truncate position %r" % (pos,))
+ else:
+ try:
+ pos.__index__
+ except AttributeError:
+ raise TypeError("an integer is required")
+ if pos < 0:
+ raise ValueError("negative truncate position %r" % (pos,))
del self._buffer[pos:]
return pos
@@ -1752,6 +1757,10 @@
if n is None:
n = -1
decoder = self._decoder or self._get_decoder()
+ try:
+ n.__index__
+ except AttributeError:
+ raise TypeError("an integer is required")
if n < 0:
# Read everything.
result = (self._get_decoded_chars() +