Skip to content

Commit d735769

Browse files
Adam's suggestions
1 parent 1513e9f commit d735769

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

Doc/whatsnew/3.14.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,10 +1310,8 @@ Build changes
13101310
* GNU Autoconf 2.72 is now required to generate :file:`configure`.
13111311
(Contributed by Erlend Aasland in :gh:`115765`.)
13121312

1313-
* zlib is now officially required to build CPython.
1314-
It is still technically possible to build CPython without it for special needs, like bootstrapping.
1315-
Such builds are not supported, but we can accept pull requests to keep them working.
1316-
As an exception, zlib is not required on WASI.
1313+
* zlib is now required to build CPytho on all platforms except WASI.
1314+
For more information see :pep:`775`.
13171315
(Contributed by Stan Ulbrych and Gregory P. Smith in :gh:`91246`.)
13181316

13191317
.. _whatsnew314-pep761:

Lib/shutil.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,12 +1113,11 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0,
11131113
_ARCHIVE_FORMATS = {
11141114
'tar': (_make_tarball, [('compress', None)],
11151115
"uncompressed tar file"),
1116+
'gztar': (_make_tarball, [('compress', 'gzip')],
1117+
"gzip'ed tar-file"),
1118+
'zip': (_make_zipfile, [], "ZIP file")
11161119
}
11171120

1118-
_ARCHIVE_FORMATS['gztar'] = (_make_tarball, [('compress', 'gzip')],
1119-
"gzip'ed tar-file")
1120-
_ARCHIVE_FORMATS['zip'] = (_make_zipfile, [], "ZIP file")
1121-
11221121
if _BZ2_SUPPORTED:
11231122
_ARCHIVE_FORMATS['bztar'] = (_make_tarball, [('compress', 'bzip2')],
11241123
"bzip2'ed tar-file")

Lib/test/test_zlib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import unittest
22
from test import support
3-
from test.support import import_helper
43
import binascii
54
import copy
65
import pickle
76
import random
87
import sys
9-
from test.support import bigmemtest, _1G, _4G, is_s390x
108
import importlib
9+
from test.support import bigmemtest, _1G, _4G, is_s390x
1110

1211
# Building CPython without zlib is not supported except WASI.
1312
#
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Make zlib required to build CPython with the exception of WASI.
2-
(Contributed by Stan Ulbrych in :gh:`130297`.)
1+
Make zlib required to build CPython with the exception of WASI implementing :pep:`775`.
2+
(Contributed by Stan Ulbrych and Gregory P. Smith in :gh:`130297`.)

0 commit comments

Comments
 (0)