Jun 25, 2022 · Jul 31, 2017 · Jul 31, 2017 · Aug 1, 2017 · Jun 17, 2022 · Jun 17, 2022
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
   If *fileobj* is specified, it is used as an alternative to a :term:`file object`
   opened in binary mode for *name*. It is supposed to be at position 0.

   For modes ``'w:gz'``, ``'r:gz'``, ``'w:bz2'``, ``'r:bz2'``, ``'x:gz'``,
   ``'x:bz2'``, :func:`tarfile.open` accepts the keyword argument
   For modes ``'w:gz'``, ``'x:gz'``, ``'w|gz'``, ``'w:bz2'``, ``'x:bz2'``,
   ``'w|bz2'``, :func:`tarfile.open` accepts the keyword argument
   *compresslevel* (default ``9``) to specify the compression level of the file.

   For modes ``'w:xz'`` and ``'x:xz'``, :func:`tarfile.open` accepts the
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
       _Stream is intended to be used only internally.
    """

    def __init__(self, name, mode, comptype, fileobj, bufsize):
    def __init__(self, name, mode, comptype, fileobj, bufsize,
                 compresslevel=9):
        """Construct a _Stream object.
        """
        self._extfileobj = True
            fileobj = _StreamProxy(fileobj)
            comptype = fileobj.getcomptype()

        self.name= name or ""
        self.mode= mode
        self.name = name or ""
        self.mode = mode
        self.comptype = comptype
        self.fileobj  = fileobj
        self.bufsize  = bufsize
        self.buf      = b""
        self.pos      = 0
        self.closed   = False
        self.fileobj = fileobj
        self.bufsize = bufsize
        self.compresslevel = compresslevel
        self.buf = b""
        self.pos = 0
        self.closed = False

        try:
            if comptype == "gz":
                    self.cmp = bz2.BZ2Decompressor()
                    self.exception = OSError
                else:
                    self.cmp = bz2.BZ2Compressor()
                    self.cmp = bz2.BZ2Compressor(self.compresslevel)

            elif comptype == "xz":
                try:
    def _init_write_gz(self):
        """Initialize for writing with gzip compression.
        """
        self.cmp = self.zlib.compressobj(9, self.zlib.DEFLATED,
                                            -self.zlib.MAX_WBITS,
                                            self.zlib.DEF_MEM_LEVEL,
                                            0)
        self.cmp = self.zlib.compressobj(self.compresslevel,
                                         self.zlib.DEFLATED,
                                         -self.zlib.MAX_WBITS,
                                         self.zlib.DEF_MEM_LEVEL,
                                         0)
        timestamp = struct.pack("<L", int(time.time()))
        self.__write(b"\037\213\010\010" + timestamp + b"\002\377")
        if self.name.endswith(".gz"):
            if filemode not in ("r", "w"):
                raise ValueError("mode must be 'r' or 'w'")

            stream = _Stream(name, filemode, comptype, fileobj, bufsize)
            compresslevel = kwargs.pop("compresslevel", 9)
            stream = _Stream(name, filemode, comptype, fileobj, bufsize,
                             compresslevel)
            try:
                t = cls(name, filemode, stream, **kwargs)
            except:
diff --git a/Misc/NEWS.d/next/Library/2017-07-31-13-35-28.bpo-26253.8v_sCs.rst b/Misc/NEWS.d/next/Library/2017-07-31-13-35-28.bpo-26253.8v_sCs.rst
 Adjustable compression level for tarfile streams.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,8 +98,8 @@ Some facts and figures:
		If fileobj is specified, it is used as an alternative to a :term:`file object`
		opened in binary mode for name. It is supposed to be at position 0.

		For modes ``'w:gz'``, ``'r:gz'``, ``'w:bz2'``, ``'r:bz2'``, ``'x:gz'``,
		``'x:bz2'``, :func:`tarfile.open` accepts the keyword argument
		For modes ``'w:gz'``, ``'x:gz'``, ``'w\|gz'``, ``'w:bz2'``, ``'x:bz2'``,
Copy link Member serhiy-storchakaJul 31, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Add the`versionchanged` directive. Document the change in the What's New document. Copy link ContributorAuthor jarondlAug 1, 2017• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. `versionchanged` - Done
		``'w\|bz2'``, :func:`tarfile.open` accepts the keyword argument
		compresslevel (default ``9``) to specify the compression level of the file.

		For modes ``'w:xz'`` and ``'x:xz'``, :func:`tarfile.open` accepts the
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -336,7 +336,8 @@ class _Stream:
		_Stream is intended to be used only internally.
		"""

		def __init__(self, name, mode, comptype, fileobj, bufsize):
		def __init__(self, name, mode, comptype, fileobj, bufsize,
		compresslevel=9):
Copy link Member serhiy-storchakaJul 31, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Since`_Stream` is intended to be used only internally, we are free to change the signature of its constructor. The default argument for`compresslevel` is not needed. This just duplicates its value.
		"""Construct a _Stream object.
		"""
		self._extfileobj = True
Expand All		@@ -350,14 +351,15 @@ def __init__(self, name, mode, comptype, fileobj, bufsize):
		fileobj = _StreamProxy(fileobj)
		comptype = fileobj.getcomptype()

		self.name= name or ""
		self.mode= mode
		self.name = name or ""
		self.mode = mode
		self.comptype = comptype
		self.fileobj = fileobj
		self.bufsize = bufsize
		self.buf = b""
		self.pos = 0
		self.closed = False
		self.fileobj = fileobj
		self.bufsize = bufsize
		self.compresslevel = compresslevel
Copy link Member serhiy-storchakaJul 31, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Is it needed to save`compresslevel` as an attribute? Wouldn't be enough to pass`compresslevel` as an argument to`_init_write_gz()`? Copy link ContributorAuthor jarondlJul 31, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. No it is not needed. My first approach was to pass it as an argument to`_init_write_gz()`, with a default value of 9 (not to change the signature). But then I got the sense that an attribute goes more naturally with the rest of the class. I can revert to the first approach if you prefer. Copy link Member serhiy-storchakaJul 31, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Other attributes are used in multiple`_Stream` methods or are needed for simulating a file object. But`compresslevel` is used only in the constructor (`_init_write_gz()` is a factored out part of the constructor). It is not needed after creating a`_Stream` object.
		self.buf = b""
		self.pos = 0
		self.closed = False

		try:
		if comptype == "gz":
Expand All		@@ -383,7 +385,7 @@ def __init__(self, name, mode, comptype, fileobj, bufsize):
		self.cmp = bz2.BZ2Decompressor()
		self.exception = OSError
		else:
		self.cmp = bz2.BZ2Compressor()
		self.cmp = bz2.BZ2Compressor(self.compresslevel)

		elif comptype == "xz":
		try:
Expand DownExpand Up		@@ -413,10 +415,11 @@ def __del__(self):
		def _init_write_gz(self):
		"""Initialize for writing with gzip compression.
		"""
		self.cmp = self.zlib.compressobj(9, self.zlib.DEFLATED,
		-self.zlib.MAX_WBITS,
		self.zlib.DEF_MEM_LEVEL,
		0)
		self.cmp = self.zlib.compressobj(self.compresslevel,
		self.zlib.DEFLATED,
		-self.zlib.MAX_WBITS,
		self.zlib.DEF_MEM_LEVEL,
		0)
		timestamp = struct.pack("<L", int(time.time()))
		self.__write(b"\037\213\010\010" + timestamp + b"\002\377")
		if self.name.endswith(".gz"):
Expand DownExpand Up		@@ -1649,7 +1652,9 @@ def not_compressed(comptype):
		if filemode not in ("r", "w"):
		raise ValueError("mode must be 'r' or 'w'")

		stream = _Stream(name, filemode, comptype, fileobj, bufsize)
		compresslevel = kwargs.pop("compresslevel", 9)
		stream = _Stream(name, filemode, comptype, fileobj, bufsize,
		compresslevel)
		try:
		t = cls(name, filemode, stream, **kwargs)
		except:
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Adjustable compression level for tarfile streams.
serhiy-storchaka marked this conversation as resolved. OutdatedShow resolvedHide resolved