Mailman 3 December 2017 - Python-checkins

Add a missing space in tkinter documentation. (GH-4692)
by Mariatta Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/ae342cf7deebdcf2035f4064609b32b210… commit: ae342cf7deebdcf2035f4064609b32b2102dadcf branch: master author: Julien Palard <julien(a)palard.fr> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-12-04T21:05:33-08:00 summary: Add a missing space in tkinter documentation. (GH-4692) files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 3e1faed8c7b..f51add2b41f 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -154,7 +154,7 @@ background material, while the second half can be taken to the keyboard as a handy reference. When trying to answer questions of the form "how do I do blah", it is often best -to find out how to do"blah" in straight Tk, and then convert this back into the +to find out how to do "blah" in straight Tk, and then convert this back into the corresponding :mod:`tkinter` call. Python programmers can often guess at the correct Python command by looking at the Tk documentation. This means that in order to use Tkinter, you will have to know a little bit about Tk. This document

1 0

[3.6] bpo-31380: Skip test_httpservers test_undecodable_file on macOS. (GH-4720) (#4721)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/d9cadc5f597e5966132c9249f6c7ff0ed1… commit: d9cadc5f597e5966132c9249f6c7ff0ed1eba0cb branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Ned Deily <nad(a)python.org> date: 2017-12-05T00:03:29-05:00 summary: [3.6] bpo-31380: Skip test_httpservers test_undecodable_file on macOS. (GH-4720) (#4721) The undecodable file name cannot be created on macOS APFS file systems. (cherry picked from commit b3edde8dd44c878e9f039a2165d00ff075157d4b) files: A Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst M Lib/test/test_httpservers.py diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 22b3bf5235c..66e937e04b6 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -370,7 +370,8 @@ def close_conn(): reader.close() return body - @support.requires_mac_ver(10, 5) + @unittest.skipIf(sys.platform == 'darwin', + 'undecodable name cannot always be decoded on macOS') @unittest.skipIf(sys.platform == 'win32', 'undecodable name cannot be decoded on win32') @unittest.skipUnless(support.TESTFN_UNDECODABLE, diff --git a/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst b/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst new file mode 100644 index 00000000000..2baecf5adcf --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst @@ -0,0 +1 @@ +Skip test_httpservers test_undecodable_file on macOS: fails on APFS.

1 0

bpo-31380: Skip test_httpservers test_undecodable_file on macOS. (#4720)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/b3edde8dd44c878e9f039a2165d00ff075… commit: b3edde8dd44c878e9f039a2165d00ff075157d4b branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-12-04T23:42:02-05:00 summary: bpo-31380: Skip test_httpservers test_undecodable_file on macOS. (#4720) The undecodable file name cannot be created on macOS APFS file systems. files: A Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst M Lib/test/test_httpservers.py diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 20e6f66766f..cc829a522b8 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -384,7 +384,8 @@ def close_conn(): reader.close() return body - @support.requires_mac_ver(10, 5) + @unittest.skipIf(sys.platform == 'darwin', + 'undecodable name cannot always be decoded on macOS') @unittest.skipIf(sys.platform == 'win32', 'undecodable name cannot be decoded on win32') @unittest.skipUnless(support.TESTFN_UNDECODABLE, diff --git a/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst b/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst new file mode 100644 index 00000000000..2baecf5adcf --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2017-12-04-23-19-16.bpo-31380.VlMmHW.rst @@ -0,0 +1 @@ +Skip test_httpservers test_undecodable_file on macOS: fails on APFS.

1 0

bpo-28791: Update Windows builds to use SQLite 3.21.0. (GH-4246). (GH-4717)
by Mariatta Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/e2ba5523192a9cff125fce2ce530bec574… commit: e2ba5523192a9cff125fce2ce530bec574353f7b branch: 3.6 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-12-04T20:09:57-08:00 summary: bpo-28791: Update Windows builds to use SQLite 3.21.0. (GH-4246). (GH-4717) (cherry picked from commit 31af650ee25f65794b75d4dfefed6fe4758781c1) files: A Misc/NEWS.d/next/Build/2017-11-02-20-30-57.bpo-28791.VaE3o8.rst M PCbuild/get_externals.bat M PCbuild/python.props M PCbuild/readme.txt diff --git a/Misc/NEWS.d/next/Build/2017-11-02-20-30-57.bpo-28791.VaE3o8.rst b/Misc/NEWS.d/next/Build/2017-11-02-20-30-57.bpo-28791.VaE3o8.rst new file mode 100644 index 00000000000..b25b0e0e9f3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-11-02-20-30-57.bpo-28791.VaE3o8.rst @@ -0,0 +1 @@ +Update Windows builds to use SQLite 3.21.0. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 0a86892c350..e6faab14de7 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -42,7 +42,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k -set libraries=%libraries% sqlite-3.14.2.0 +set libraries=%libraries% sqlite-3.21.0.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6 diff --git a/PCbuild/python.props b/PCbuild/python.props index 82cb8b646fe..16a7672315f 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -44,7 +44,7 @@  <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir> - <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> + <sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> <opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index d4fd9a567cc..6f9b9a215c4 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -212,7 +212,7 @@ _ssl functionality to _ssl or _hashlib. They will not clean up their output with the normal Clean target; CleanAll should be used instead. _sqlite3 - Wraps SQLite 3.14.2.0, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.21.0.0, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter

1 0

Update macOS installer to XZ 5.2.3 (#4718)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/e6f8a7378d701823c6821217bf7ac8a540… commit: e6f8a7378d701823c6821217bf7ac8a540ab143b branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-12-04T22:55:20-05:00 summary: Update macOS installer to XZ 5.2.3 (#4718) files: M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index dbe5ffd104b..cc6241f817a 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -270,9 +270,9 @@ def library_recipes(): if PYTHON_3: result.extend([ dict( - name="XZ 5.2.2", - url="http://tukaani.org/xz/xz-5.2.2.tar.gz", - checksum='7cf6a8544a7dae8e8106fdf7addfa28c', + name="XZ 5.2.3", + url="http://tukaani.org/xz/xz-5.2.3.tar.gz", + checksum='ef68674fb47a8b8e741b34e429d86e9d', configure_pre=[ '--disable-dependency-tracking', ]

1 0

[3.6] bpo-31392: Update macOS installer to use OpenSSL 1.0.2m (GH-4715) (#4716)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/0bec5e147a6c0f62517df8e7033a380874… commit: 0bec5e147a6c0f62517df8e7033a38087451d5d4 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Ned Deily <nad(a)python.org> date: 2017-12-04T22:54:43-05:00 summary: [3.6] bpo-31392: Update macOS installer to use OpenSSL 1.0.2m (GH-4715) (#4716) (cherry picked from commit 24e046987b8e34bb4f1f3fd9bd31f1d605e347dc) files: A Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3b8cf69d757..52f391a4316 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -213,9 +213,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.0.2k", - url="https://www.openssl.org/source/openssl-1.0.2k.tar.gz", - checksum='f965fc0bf01bf882b31314b61391ae65', + name="OpenSSL 1.0.2m", + url="https://www.openssl.org/source/openssl-1.0.2m.tar.gz", + checksum='10e9e37f492094b9ef296f68f24a7666', patches=[ "openssl_sdk_makedepend.patch", ], @@ -844,7 +844,6 @@ def build_openssl_arch(archbase, arch): "enable-tlsext", "no-ssl2", "no-ssl3", - "no-ssl3-method", # "enable-unit-test", "shared", "--install_prefix=%s"%shellQuote(archbase), diff --git a/Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst b/Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst new file mode 100644 index 00000000000..555b3812c6a --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst @@ -0,0 +1 @@ +Update macOS installer to use OpenSSL 1.0.2m

1 0

bpo-31392: Update macOS installer to use OpenSSL 1.0.2m (#4715)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/24e046987b8e34bb4f1f3fd9bd31f1d605… commit: 24e046987b8e34bb4f1f3fd9bd31f1d605e347dc branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-12-04T22:24:41-05:00 summary: bpo-31392: Update macOS installer to use OpenSSL 1.0.2m (#4715) files: A Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 674f025db3e..dbe5ffd104b 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -213,9 +213,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.0.2k", - url="https://www.openssl.org/source/openssl-1.0.2k.tar.gz", - checksum='f965fc0bf01bf882b31314b61391ae65', + name="OpenSSL 1.0.2m", + url="https://www.openssl.org/source/openssl-1.0.2m.tar.gz", + checksum='10e9e37f492094b9ef296f68f24a7666', patches=[ "openssl_sdk_makedepend.patch", ], @@ -845,7 +845,6 @@ def build_openssl_arch(archbase, arch): "enable-tlsext", "no-ssl2", "no-ssl3", - "no-ssl3-method", # "enable-unit-test", "shared", "--install_prefix=%s"%shellQuote(archbase), diff --git a/Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst b/Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst new file mode 100644 index 00000000000..555b3812c6a --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2017-12-04-21-57-43.bpo-31392.f8huBC.rst @@ -0,0 +1 @@ +Update macOS installer to use OpenSSL 1.0.2m

1 0

[bpo-28556] Minor fixes for typing module (GH-4710) (#4713)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/b0576278b2d44472c73696f6dea4855f7f… commit: b0576278b2d44472c73696f6dea4855f7ffb7ff1 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Ned Deily <nad(a)python.org> date: 2017-12-04T22:02:02-05:00 summary: [bpo-28556] Minor fixes for typing module (GH-4710) (#4713) (cherry picked from commit 29bc19321018ec6e58f9f4da9c18c42e9a9c580e) files: A Misc/NEWS.d/next/Library/2017-12-05-02-03-07.bpo-28556.9Z_PsJ.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index ffefa8ed2dd..fe5247c2602 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -37,6 +37,9 @@ from test import mod_generics_cache +PY36 = sys.version_info[:2] >= (3, 6) + + class BaseTestCase(TestCase): def assertIsSubclass(self, cls, class_or_tuple, msg=None): @@ -633,6 +636,27 @@ def test_init(self): with self.assertRaises(TypeError): Generic[T, S, T] + @skipUnless(PY36, "__init_subclass__ support required") + def test_init_subclass(self): + class X(typing.Generic[T]): + def __init_subclass__(cls, **kwargs): + super().__init_subclass__(**kwargs) + cls.attr = 42 + class Y(X): + pass + self.assertEqual(Y.attr, 42) + with self.assertRaises(AttributeError): + X.attr + X.attr = 1 + Y.attr = 2 + class Z(Y): + pass + class W(X[int]): + pass + self.assertEqual(Y.attr, 2) + self.assertEqual(Z.attr, 42) + self.assertEqual(W.attr, 42) + def test_repr(self): self.assertEqual(repr(SimpleMapping), __name__ + '.' + 'SimpleMapping') @@ -1080,6 +1104,30 @@ class Node(Generic[T]): ... self.assertTrue(t is copy(t)) self.assertTrue(t is deepcopy(t)) + def test_copy_generic_instances(self): + T = TypeVar('T') + class C(Generic[T]): + def __init__(self, attr: T) -> None: + self.attr = attr + + c = C(42) + self.assertEqual(copy(c).attr, 42) + self.assertEqual(deepcopy(c).attr, 42) + self.assertIsNot(copy(c), c) + self.assertIsNot(deepcopy(c), c) + c.attr = 1 + self.assertEqual(copy(c).attr, 1) + self.assertEqual(deepcopy(c).attr, 1) + ci = C[int](42) + self.assertEqual(copy(ci).attr, 42) + self.assertEqual(deepcopy(ci).attr, 42) + self.assertIsNot(copy(ci), ci) + self.assertIsNot(deepcopy(ci), ci) + ci.attr = 1 + self.assertEqual(copy(ci).attr, 1) + self.assertEqual(deepcopy(ci).attr, 1) + self.assertEqual(ci.__orig_class__, C[int]) + def test_weakref_all(self): T = TypeVar('T') things = [Any, Union[T, int], Callable[..., T], Tuple[Any, Any], @@ -1580,8 +1628,6 @@ class ACM: asyncio = None AwaitableWrapper = AsyncIteratorWrapper = ACM = object -PY36 = sys.version_info[:2] >= (3, 6) - PY36_TESTS = """ from test import ann_module, ann_module2, ann_module3 from typing import AsyncContextManager diff --git a/Lib/typing.py b/Lib/typing.py index c00a3a10e1f..b5564cc29a2 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -973,7 +973,8 @@ def __new__(cls, name, bases, namespace, # remove bare Generic from bases if there are other generic bases if any(isinstance(b, GenericMeta) and b is not Generic for b in bases): bases = tuple(b for b in bases if b is not Generic) - namespace.update({'__origin__': origin, '__extra__': extra}) + namespace.update({'__origin__': origin, '__extra__': extra, + '_gorg': None if not origin else origin._gorg}) self = super().__new__(cls, name, bases, namespace, _root=True) super(GenericMeta, self).__setattr__('_gorg', self if not origin else origin._gorg) @@ -1160,17 +1161,12 @@ def __instancecheck__(self, instance): # classes are supposed to be rare anyways. return issubclass(instance.__class__, self) - def __copy__(self): - return self.__class__(self.__name__, self.__bases__, - _no_slots_copy(self.__dict__), - self.__parameters__, self.__args__, self.__origin__, - self.__extra__, self.__orig_bases__) - def __setattr__(self, attr, value): # We consider all the subscripted generics as proxies for original class if ( attr.startswith('__') and attr.endswith('__') or - attr.startswith('_abc_') + attr.startswith('_abc_') or + self._gorg is None # The class is not fully created, see #typing/506 ): super(GenericMeta, self).__setattr__(attr, value) else: diff --git a/Misc/NEWS.d/next/Library/2017-12-05-02-03-07.bpo-28556.9Z_PsJ.rst b/Misc/NEWS.d/next/Library/2017-12-05-02-03-07.bpo-28556.9Z_PsJ.rst new file mode 100644 index 00000000000..8f3a8954970 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-12-05-02-03-07.bpo-28556.9Z_PsJ.rst @@ -0,0 +1,3 @@ +Two minor fixes for ``typing`` module: allow shallow copying instances of +generic classes, improve interaction of ``__init_subclass__`` with generics. +Original PRs by Ivan Levkivskyi.

1 0

bpo-19610: Warn if distutils is provided something other than a list to some fields (#4685)
by Neil Schemenauer Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/8837dd092fe5ad5184889104e8036811ed… commit: 8837dd092fe5ad5184889104e8036811ed839f98 branch: master author: Neil Schemenauer <nas-github(a)arctrix.com> committer: GitHub <noreply(a)github.com> date: 2017-12-04T18:58:12-08:00 summary: bpo-19610: Warn if distutils is provided something other than a list to some fields (#4685) * Rather than raise TypeError, warn and call list() on the value. * Fix tests, revise NEWS and whatsnew text. * Revise documentation, a string is okay as well. * Ensure 'requires' and 'obsoletes' are real lists. * Test that requires and obsoletes are turned to lists. files: M Doc/distutils/apiref.rst M Doc/whatsnew/3.7.rst M Lib/distutils/dist.py M Lib/distutils/tests/test_dist.py M Misc/NEWS.d/next/Library/2017-11-23-16-15-55.bpo-19610.Dlca2P.rst diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index ced8837d373..9fce46ad266 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -286,9 +286,9 @@ the full reference. Distribution constructor. :func:`setup` creates a Distribution instance. .. versionchanged:: 3.7 - :class:`~distutils.core.Distribution` now raises a :exc:`TypeError` if - ``classifiers``, ``keywords`` and ``platforms`` fields are not specified - as a list. + :class:`~distutils.core.Distribution` now warns if ``classifiers``, + ``keywords`` and ``platforms`` fields are not specified as a list or + a string. .. class:: Command diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index 3d23aa773d7..9363730bf1f 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -298,10 +298,8 @@ README.rst is now included in the list of distutils standard READMEs and therefore included in source distributions. (Contributed by Ryan Gonzalez in :issue:`11913`.) -:class:`distutils.core.setup` now raises a :exc:`TypeError` if -``classifiers``, ``keywords`` and ``platforms`` fields are not specified -as a list. However, to minimize backwards incompatibility concerns, -``keywords`` and ``platforms`` fields still accept a comma separated string. +:class:`distutils.core.setup` now warns if the ``classifiers``, ``keywords`` +and ``platforms`` fields are not specified as a list or a string. (Contributed by Berker Peksag in :issue:`19610`.) http.client diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index 78c29ede6c2..6cf0a0d6632 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -27,6 +27,20 @@ command_re = re.compile(r'^[a-zA-Z]([a-zA-Z0-9_]*)$') +def _ensure_list(value, fieldname): + if isinstance(value, str): + # a string containing comma separated values is okay. It will + # be converted to a list by Distribution.finalize_options(). + pass + elif not isinstance(value, list): + # passing a tuple or an iterator perhaps, warn and convert + typename = type(value).__name__ + msg = f"Warning: '{fieldname}' should be a list, got type '{typename}'" + log.log(log.WARN, msg) + value = list(value) + return value + + class Distribution: """The core of the Distutils. Most of the work hiding behind 'setup' is really done within a Distribution instance, which farms the work out @@ -257,10 +271,7 @@ def __init__(self, attrs=None): setattr(self, key, val) else: msg = "Unknown distribution option: %s" % repr(key) - if warnings is not None: - warnings.warn(msg) - else: - sys.stderr.write(msg + "\n") + warnings.warn(msg) # no-user-cfg is handled before other command line args # because other args override the config files, and this @@ -1189,36 +1200,19 @@ def get_keywords(self): return self.keywords or [] def set_keywords(self, value): - # If 'keywords' is a string, it will be converted to a list - # by Distribution.finalize_options(). To maintain backwards - # compatibility, do not raise an exception if 'keywords' is - # a string. - if not isinstance(value, (list, str)): - msg = "'keywords' should be a 'list', not %r" - raise TypeError(msg % type(value).__name__) - self.keywords = value + self.keywords = _ensure_list(value, 'keywords') def get_platforms(self): return self.platforms or ["UNKNOWN"] def set_platforms(self, value): - # If 'platforms' is a string, it will be converted to a list - # by Distribution.finalize_options(). To maintain backwards - # compatibility, do not raise an exception if 'platforms' is - # a string. - if not isinstance(value, (list, str)): - msg = "'platforms' should be a 'list', not %r" - raise TypeError(msg % type(value).__name__) - self.platforms = value + self.platforms = _ensure_list(value, 'platforms') def get_classifiers(self): return self.classifiers or [] def set_classifiers(self, value): - if not isinstance(value, list): - msg = "'classifiers' should be a 'list', not %r" - raise TypeError(msg % type(value).__name__) - self.classifiers = value + self.classifiers = _ensure_list(value, 'classifiers') def get_download_url(self): return self.download_url or "UNKNOWN" @@ -1231,7 +1225,7 @@ def set_requires(self, value): import distutils.versionpredicate for v in value: distutils.versionpredicate.VersionPredicate(v) - self.requires = value + self.requires = list(value) def get_provides(self): return self.provides or [] @@ -1250,7 +1244,7 @@ def set_obsoletes(self, value): import distutils.versionpredicate for v in value: distutils.versionpredicate.VersionPredicate(v) - self.obsoletes = value + self.obsoletes = list(value) def fix_help_options(options): """Convert a 4-tuple 'help_options' list as found in various command diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py index 50b456ec947..0a19f0fb627 100644 --- a/Lib/distutils/tests/test_dist.py +++ b/Lib/distutils/tests/test_dist.py @@ -11,7 +11,9 @@ from distutils.dist import Distribution, fix_help_options, DistributionMetadata from distutils.cmd import Command -from test.support import TESTFN, captured_stdout, run_unittest +from test.support import ( + TESTFN, captured_stdout, captured_stderr, run_unittest +) from distutils.tests import support from distutils import log @@ -319,6 +321,13 @@ def test_requires_illegal(self): "version": "1.0", "requires": ["my.pkg (splat)"]}) + def test_requires_to_list(self): + attrs = {"name": "package", + "requires": iter(["other"])} + dist = Distribution(attrs) + self.assertIsInstance(dist.metadata.requires, list) + + def test_obsoletes(self): attrs = {"name": "package", "version": "1.0", @@ -341,6 +350,12 @@ def test_obsoletes_illegal(self): "version": "1.0", "obsoletes": ["my.pkg (splat)"]}) + def test_obsoletes_to_list(self): + attrs = {"name": "package", + "obsoletes": iter(["other"])} + dist = Distribution(attrs) + self.assertIsInstance(dist.metadata.obsoletes, list) + def test_classifier(self): attrs = {'name': 'Boa', 'version': '3.0', 'classifiers': ['Programming Language :: Python :: 3']} @@ -353,9 +368,14 @@ def test_classifier(self): def test_classifier_invalid_type(self): attrs = {'name': 'Boa', 'version': '3.0', 'classifiers': ('Programming Language :: Python :: 3',)} - msg = "'classifiers' should be a 'list', not 'tuple'" - with self.assertRaises(TypeError, msg=msg): - Distribution(attrs) + with captured_stderr() as error: + d = Distribution(attrs) + # should have warning about passing a non-list + self.assertIn('should be a list', error.getvalue()) + # should be converted to a list + self.assertIsInstance(d.metadata.classifiers, list) + self.assertEqual(d.metadata.classifiers, + list(attrs['classifiers'])) def test_keywords(self): attrs = {'name': 'Monty', 'version': '1.0', @@ -367,9 +387,13 @@ def test_keywords(self): def test_keywords_invalid_type(self): attrs = {'name': 'Monty', 'version': '1.0', 'keywords': ('spam', 'eggs', 'life of brian')} - msg = "'keywords' should be a 'list', not 'tuple'" - with self.assertRaises(TypeError, msg=msg): - Distribution(attrs) + with captured_stderr() as error: + d = Distribution(attrs) + # should have warning about passing a non-list + self.assertIn('should be a list', error.getvalue()) + # should be converted to a list + self.assertIsInstance(d.metadata.keywords, list) + self.assertEqual(d.metadata.keywords, list(attrs['keywords'])) def test_platforms(self): attrs = {'name': 'Monty', 'version': '1.0', @@ -381,9 +405,13 @@ def test_platforms(self): def test_platforms_invalid_types(self): attrs = {'name': 'Monty', 'version': '1.0', 'platforms': ('GNU/Linux', 'Some Evil Platform')} - msg = "'platforms' should be a 'list', not 'tuple'" - with self.assertRaises(TypeError, msg=msg): - Distribution(attrs) + with captured_stderr() as error: + d = Distribution(attrs) + # should have warning about passing a non-list + self.assertIn('should be a list', error.getvalue()) + # should be converted to a list + self.assertIsInstance(d.metadata.platforms, list) + self.assertEqual(d.metadata.platforms, list(attrs['platforms'])) def test_download_url(self): attrs = {'name': 'Boa', 'version': '3.0', diff --git a/Misc/NEWS.d/next/Library/2017-11-23-16-15-55.bpo-19610.Dlca2P.rst b/Misc/NEWS.d/next/Library/2017-11-23-16-15-55.bpo-19610.Dlca2P.rst index 5ea87a45722..514740b433f 100644 --- a/Misc/NEWS.d/next/Library/2017-11-23-16-15-55.bpo-19610.Dlca2P.rst +++ b/Misc/NEWS.d/next/Library/2017-11-23-16-15-55.bpo-19610.Dlca2P.rst @@ -1,5 +1,4 @@ -``setup()`` now raises :exc:`TypeError` for invalid types. +``setup()`` now warns about invalid types for some fields. -The ``distutils.dist.Distribution`` class now explicitly raises an exception -when ``classifiers``, ``keywords`` and ``platforms`` fields are not -specified as a list. +The ``distutils.dist.Distribution`` class now warns when ``classifiers``, +``keywords`` and ``platforms`` fields are not specified as a list or a string.

1 0

Enable SQLite JSON functions for macOS installer build (#4712)
by Ned Deily Dec. 5, 2017

Dec. 5, 2017

https://github.com/python/cpython/commit/9625bf520e08828e36bc3b1d043af679eb… commit: 9625bf520e08828e36bc3b1d043af679eb5f993d branch: master author: Ned Deily <nad(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-12-04T21:50:29-05:00 summary: Enable SQLite JSON functions for macOS installer build (#4712) files: M Mac/BuildScript/build-installer.py diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3b8cf69d757..674f025db3e 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -322,6 +322,7 @@ def library_recipes(): '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' '-DSQLITE_ENABLE_FTS3_PARENTHESIS ' + '-DSQLITE_ENABLE_JSON1 ' '-DSQLITE_ENABLE_RTREE ' '-DSQLITE_TCL=0 ' '%s' % ('','-DSQLITE_WITHOUT_ZONEMALLOC ')[LT_10_5]),

1 0