aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rwxr-xr-xtest_archivemail6
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3f0a3ae..b3f8f72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@ version 0.?.? - UNRELEASED
* Fixed manpage installation path to be FHS compliant
* Speed up IMAP archiving with the --quiet option
* Ported the manpage from SGML to XML
+ * Fix test suite failures with Python 2.7 by letting the test suite method
+ FixedGzipFile.seek() return the new absolute file position.
+ Closes: #3314293.
version 0.8.2 - 16 October 2010
diff --git a/test_archivemail b/test_archivemail
index 6fff170..d3455b2 100755
--- a/test_archivemail
+++ b/test_archivemail
@@ -85,14 +85,16 @@ class FixedGzipFile(gzip.GzipFile):
"""GzipFile with seek method accepting whence parameter."""
def seek(self, offset, whence=0):
try:
- gzip.GzipFile.seek(self, offset, whence)
+ # Try calling gzip.GzipFile.seek with the whence parameter.
+ # For Python >= 2.7, it returns the new offset; pass that on.
+ return gzip.GzipFile.seek(self, offset, whence)
except TypeError:
if whence:
if whence == 1:
offset = self.offset + offset
else:
raise ValueError('Seek from end not supported')
- gzip.GzipFile.seek(self, offset)
+ return gzip.GzipFile.seek(self, offset)
# precision of os.utime() when restoring mbox timestamps
utimes_precision = 5