]> granicus.if.org Git - python/commitdiff
Really fix test_gzip failures on Windows.
authorNadeem Vawda <nadeem.vawda@gmail.com>
Sun, 6 May 2012 17:24:18 +0000 (19:24 +0200)
committerNadeem Vawda <nadeem.vawda@gmail.com>
Sun, 6 May 2012 17:24:18 +0000 (19:24 +0200)
Lib/test/test_gzip.py

index d7b5d4953d82023b4927edfa689d4f36cfa3c621..270411bd80c4e03e176d149e5c5b69506eb45287 100644 (file)
@@ -409,19 +409,20 @@ class TestOpen(BaseTest):
             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 @@ class TestOpen(BaseTest):
 
     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)