From: Lars Gustäbel <lars@gustaebel.de>
Date: Wed, 18 Jan 2012 13:01:17 +0000 (+0100)
Subject: Issue #5689: Avoid excessive memory usage by using the default lzma preset.
X-Git-Tag: v3.3.0a1~356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5e1199f3865a2671e3ce16c6265aa869466356b;p=python

Issue #5689: Avoid excessive memory usage by using the default lzma preset.
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 5c9d3a8f35..e3380a2d6b 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1807,7 +1807,7 @@ class TarFile(object):
         return t
 
     @classmethod
-    def xzopen(cls, name, mode="r", fileobj=None, preset=9, **kwargs):
+    def xzopen(cls, name, mode="r", fileobj=None, preset=None, **kwargs):
         """Open lzma compressed tar archive name for reading or writing.
            Appending is not allowed.
         """
@@ -1819,10 +1819,6 @@ class TarFile(object):
         except ImportError:
             raise CompressionError("lzma module is not available")
 
-        if mode == "r":
-            # LZMAFile complains about a preset argument in read mode.
-            preset = None
-
         fileobj = lzma.LZMAFile(filename=name if fileobj is None else None,
                 mode=mode, fileobj=fileobj, preset=preset)