[Python-checkins] cpython: Really fix test_gzip failures on Windows.

[nadeem.vawda]

http://hg.python.org/cpython/rev/875ba78bee10
changeset:   76804:875ba78bee10
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun May 06 19:24:18 2012 +0200
summary:
  Really fix test_gzip failures on Windows.

files:
  Lib/test/test_gzip.py |  12 +++++++-----
  1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -409,19 +409,20 @@
             self.assertEqual(file_data, uncompressed * 2)
 
     def test_text_modes(self):
-        uncompressed = data1.decode("ascii").replace("\n", os.linesep) * 50
+        uncompressed = data1.decode("ascii") * 50
+        uncompressed_raw = uncompressed.replace("\n", os.linesep)
         with gzip.open(self.filename, "wt") as f:
             f.write(uncompressed)
         with open(self.filename, "rb") as f:
             file_data = gzip.decompress(f.read()).decode("ascii")
-            self.assertEqual(file_data, uncompressed)
+            self.assertEqual(file_data, uncompressed_raw)
         with gzip.open(self.filename, "rt") as f:
             self.assertEqual(f.read(), uncompressed)
         with gzip.open(self.filename, "at") as f:
             f.write(uncompressed)
         with open(self.filename, "rb") as f:
             file_data = gzip.decompress(f.read()).decode("ascii")
-            self.assertEqual(file_data, uncompressed * 2)
+            self.assertEqual(file_data, uncompressed_raw * 2)
 
     def test_bad_params(self):
         # Test invalid parameter combinations.
@@ -436,12 +437,13 @@
 
     def test_encoding(self):
         # Test non-default encoding.
-        uncompressed = data1.decode("ascii").replace("\n", os.linesep) * 50
+        uncompressed = data1.decode("ascii") * 50
+        uncompressed_raw = uncompressed.replace("\n", os.linesep)
         with gzip.open(self.filename, "wt", encoding="utf-16") as f:
             f.write(uncompressed)
         with open(self.filename, "rb") as f:
             file_data = gzip.decompress(f.read()).decode("utf-16")
-            self.assertEqual(file_data, uncompressed)
+            self.assertEqual(file_data, uncompressed_raw)
         with gzip.open(self.filename, "rt", encoding="utf-16") as f:
             self.assertEqual(f.read(), uncompressed)
 

-- 
Repository URL: http://hg.python.org/cpython