Skip to content

Commit

Permalink
bpo-36268: Change default tar format to pax from GNU. (pythonGH-12355)
Browse files Browse the repository at this point in the history
  • Loading branch information
CAM-Gerlach authored and serhiy-storchaka committed Mar 21, 2019
1 parent ed5e29c commit e680c3d
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 10 deletions.
14 changes: 10 additions & 4 deletions Doc/library/tarfile.rst
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,11 @@ details.

.. data:: DEFAULT_FORMAT

The default format for creating archives. This is currently :const:`GNU_FORMAT`.
The default format for creating archives. This is currently :const:`PAX_FORMAT`.

.. versionchanged:: 3.8
The default format for new archives was changed to
:const:`PAX_FORMAT` from :const:`GNU_FORMAT`.


.. seealso::
Expand Down Expand Up @@ -820,8 +824,10 @@ There are three tar formats that can be created with the :mod:`tarfile` module:

* The POSIX.1-2001 pax format (:const:`PAX_FORMAT`). It is the most flexible
format with virtually no limits. It supports long filenames and linknames, large
files and stores pathnames in a portable way. However, not all tar
implementations today are able to handle pax archives properly.
files and stores pathnames in a portable way. Modern tar implementations,
including GNU tar, bsdtar/libarchive and star, fully support extended *pax*
features; some older or unmaintained libraries may not, but should treat
*pax* archives as if they were in the universally-supported *ustar* format.

The *pax* format is an extension to the existing *ustar* format. It uses extra
headers for information that cannot be stored otherwise. There are two flavours
Expand Down Expand Up @@ -871,7 +877,7 @@ converted. Possible values are listed in section :ref:`error-handlers`.
The default scheme is ``'surrogateescape'`` which Python also uses for its
file system calls, see :ref:`os-filenames`.

In case of :const:`PAX_FORMAT` archives, *encoding* is generally not needed
For :const:`PAX_FORMAT` archives (the default), *encoding* is generally not needed
because all the metadata is stored using *UTF-8*. *encoding* is only used in
the rare cases when binary pax headers are decoded or when strings with
surrogate characters are stored.
10 changes: 10 additions & 0 deletions Doc/whatsnew/3.8.rst
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,16 @@ and manipulating normal distributions of a random variable.
[7.672102882379219, 12.000027119750287, 4.647488369766392]


tarfile
-------

The :mod:`tarfile` module now defaults to the modern pax (POSIX.1-2001)
format for new archives, instead of the previous GNU-specific one.
This improves cross-platform portability with a consistent encoding (UTF-8)
in a standardized and extensible format, and offers several other benefits.
(Contributed by C.A.M. Gerlach in :issue:`36268`.)


tokenize
--------

Expand Down
2 changes: 1 addition & 1 deletion Lib/tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
USTAR_FORMAT = 0 # POSIX.1-1988 (ustar) format
GNU_FORMAT = 1 # GNU tar format
PAX_FORMAT = 2 # POSIX.1-2001 (pax) format
DEFAULT_FORMAT = GNU_FORMAT
DEFAULT_FORMAT = PAX_FORMAT

#---------------------------------------------------------
# tarfile constants
Expand Down
11 changes: 6 additions & 5 deletions Lib/test/test_tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2136,15 +2136,16 @@ def test_read_number_fields(self):
def test_write_number_fields(self):
self.assertEqual(tarfile.itn(1), b"0000001\x00")
self.assertEqual(tarfile.itn(0o7777777), b"7777777\x00")
self.assertEqual(tarfile.itn(0o10000000),
self.assertEqual(tarfile.itn(0o10000000, format=tarfile.GNU_FORMAT),
b"\x80\x00\x00\x00\x00\x20\x00\x00")
self.assertEqual(tarfile.itn(0xffffffff),
self.assertEqual(tarfile.itn(0xffffffff, format=tarfile.GNU_FORMAT),
b"\x80\x00\x00\x00\xff\xff\xff\xff")
self.assertEqual(tarfile.itn(-1),
self.assertEqual(tarfile.itn(-1, format=tarfile.GNU_FORMAT),
b"\xff\xff\xff\xff\xff\xff\xff\xff")
self.assertEqual(tarfile.itn(-100),
self.assertEqual(tarfile.itn(-100, format=tarfile.GNU_FORMAT),
b"\xff\xff\xff\xff\xff\xff\xff\x9c")
self.assertEqual(tarfile.itn(-0x100000000000000),
self.assertEqual(tarfile.itn(-0x100000000000000,
format=tarfile.GNU_FORMAT),
b"\xff\x00\x00\x00\x00\x00\x00\x00")

# Issue 32713: Test if itn() supports float values outside the
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Switch the default format used for writing tars with mod:`tarfile` to
the modern POSIX.1-2001 pax standard, from the vendor-specific GNU.
Contributed by C.A.M. Gerlach.

0 comments on commit e680c3d

Please sign in to comment.