From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 11 Sep 2011 20:38:11 +0000 (+0200)
Subject: BZ2File now uses the compresslevel argument given by the caller,
X-Git-Tag: v3.3.0a1~1549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=249ab5e8d1452ab7bc43b0f1e1221e0065d2e52d;p=thirdparty%2FPython%2Fcpython.git

BZ2File now uses the compresslevel argument given by the caller,
instead of ignoring it and always using a compression level of 9.
---

diff --git a/Lib/bz2.py b/Lib/bz2.py
index cc71ae025aec..cbf5233b0656 100644
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -75,11 +75,11 @@ class BZ2File(io.BufferedIOBase):
         elif mode in ("w", "wb"):
             mode = "wb"
             mode_code = _MODE_WRITE
-            self._compressor = BZ2Compressor()
+            self._compressor = BZ2Compressor(compresslevel)
         elif mode in ("a", "ab"):
             mode = "ab"
             mode_code = _MODE_WRITE
-            self._compressor = BZ2Compressor()
+            self._compressor = BZ2Compressor(compresslevel)
         else:
             raise ValueError("Invalid mode: {!r}".format(mode))
 
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index 5a7d342afde7..d0032387e972 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -224,6 +224,13 @@ class BZ2FileTest(BaseTest):
         with open(self.filename, 'rb') as f:
             self.assertEqual(self.decompress(f.read()), self.TEXT)
 
+    def testWriteNonDefaultCompressLevel(self):
+        expected = bz2.compress(self.TEXT, compresslevel=5)
+        with BZ2File(self.filename, "w", compresslevel=5) as bz2f:
+            bz2f.write(self.TEXT)
+        with open(self.filename, "rb") as f:
+            self.assertEqual(f.read(), expected)
+
     def testWriteLines(self):
         with BZ2File(self.filename, "w") as bz2f:
             self.assertRaises(TypeError, bz2f.writelines)