Mailman 3 November 2018 - Python-checkins

Add a missed PyErr_NoMemory() in symtable_new(). (GH-10576)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/0ee5409aea7eefd6a0deff697247657c75… commit: 0ee5409aea7eefd6a0deff697247657c75437c4e branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T08:31:47-08:00 summary: Add a missed PyErr_NoMemory() in symtable_new(). (GH-10576) This missed PyErr_NoMemory() could cause a SystemError when calling _symtable.symtable(). (cherry picked from commit ad65f15581173542f1d2a9968a63bee272510ce3) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: M Python/symtable.c diff --git a/Python/symtable.c b/Python/symtable.c index 81eea95f4907..177bb6d436c6 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -215,8 +215,10 @@ symtable_new(void) struct symtable *st; st = (struct symtable *)PyMem_Malloc(sizeof(struct symtable)); - if (st == NULL) + if (st == NULL) { + PyErr_NoMemory(); return NULL; + } st->st_filename = NULL; st->st_blocks = NULL;

1 0

bpo-35202: Remove unused imports in tests. (GH-10561)
by Serhiy Storchaka 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/90d0cfb22269261333e82a7c8a17b66d66… commit: 90d0cfb22269261333e82a7c8a17b66d6695f7b6 branch: master author: Srinivas Thatiparthy (శ్రీనివాస్ తాటిపర్తి) <thatiparthysreenivas(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-11-16T17:32:58+02:00 summary: bpo-35202: Remove unused imports in tests. (GH-10561) files: M Lib/test/test_aifc.py M Lib/test/test_asyncio/test_selector_events.py M Lib/test/test_coroutines.py M Lib/test/test_frozen.py M Lib/test/test_future.py M Lib/test/test_gdb.py M Lib/test/test_importlib/test_locks.py M Lib/test/test_minidom.py M Lib/test/test_netrc.py M Lib/test/test_platform.py M Lib/test/test_resource.py M Lib/test/test_sax.py M Lib/test/test_ssl.py M Lib/test/test_time.py M Lib/test/test_traceback.py M Lib/test/test_urlparse.py M Lib/test/test_utf8_mode.py diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py index ff52f5b6feb8..c74758413d6c 100644 --- a/Lib/test/test_aifc.py +++ b/Lib/test/test_aifc.py @@ -7,8 +7,6 @@ import sys import struct import aifc -import warnings - class AifcTest(audiotests.AudioWriteTests, audiotests.AudioTestsWithSourceFile): diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py index 236ed38b5577..b99e8e696070 100644 --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -1,6 +1,5 @@ """Tests for selector_events.py""" -import errno import selectors import socket import unittest diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 091b6626dcc8..8443e658a620 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -2,7 +2,6 @@ import copy import inspect import pickle -import re import sys import types import unittest diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py index a7c748422b1d..142f17d518e7 100644 --- a/Lib/test/test_frozen.py +++ b/Lib/test/test_frozen.py @@ -13,7 +13,6 @@ import sys import unittest from test.support import captured_stdout -from importlib import util class TestFrozen(unittest.TestCase): diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py index 4f2f9d272e7f..c60a016f01f4 100644 --- a/Lib/test/test_future.py +++ b/Lib/test/test_future.py @@ -1,6 +1,5 @@ # Test various flavors of legal and illegal future statements -from functools import partial import unittest from test import support from textwrap import dedent diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 711fb69ebdff..4d1ce4ed96c0 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -3,7 +3,6 @@ # The code for testing gdb was adapted from similar work in Unladen Swallow's # Lib/test/test_jit_gdb.py -import locale import os import platform import re diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py index d86172ab5837..21794d911ef6 100644 --- a/Lib/test/test_importlib/test_locks.py +++ b/Lib/test/test_importlib/test_locks.py @@ -4,7 +4,6 @@ import sys import threading -import unittest import weakref from test import support diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index ad5be2f0f0e2..e626e14a5622 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -3,7 +3,6 @@ import copy import pickle import io -import contextlib from test.support import findfile import unittest diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py index f59e5371acad..ae53988c45a6 100644 --- a/Lib/test/test_netrc.py +++ b/Lib/test/test_netrc.py @@ -1,5 +1,4 @@ import netrc, os, unittest, sys, tempfile, textwrap -from unittest import mock from test import support diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index c26e193e6536..c92da904fc5b 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -1,4 +1,3 @@ -from unittest import mock import os import platform import subprocess diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index b07eb73b2aeb..62c7963fe699 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -1,6 +1,5 @@ import contextlib import sys -import os import unittest from test import support import time diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py index 894d86ac71f0..9addc06f20dd 100644 --- a/Lib/test/test_sax.py +++ b/Lib/test/test_sax.py @@ -17,7 +17,6 @@ from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl from io import BytesIO, StringIO import codecs -import gc import os.path import shutil from urllib.error import URLError diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 6fd2002e5eec..74a91f6c2396 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -17,7 +17,6 @@ import asyncore import weakref import platform -import functools import sysconfig try: import ctypes diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 62abd891aafa..16b48a92f327 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -9,7 +9,6 @@ import time import threading import unittest -import warnings try: import _testcapi except ImportError: diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index a8240b41c084..96d85e2cb8a1 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -110,7 +110,7 @@ def test_encoded_file(self): # Test that tracebacks are correctly printed for encoded source files: # - correct line number (Issue2384) # - respect file encoding (Issue3975) - import tempfile, sys, subprocess, os + import sys, subprocess # The spawned subprocess has its stdout redirected to a PIPE, and its # encoding may be different from the current interpreter, on Windows diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 6738863f8def..9c71be53afd4 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -1,6 +1,5 @@ import unittest import urllib.parse -import warnings RFC1808_BASE = "http://a/b/c/d;p?q#f" RFC2396_BASE = "http://a/b/c/d;p?q" diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py index 7280ce77ef82..220ff34a1189 100644 --- a/Lib/test/test_utf8_mode.py +++ b/Lib/test/test_utf8_mode.py @@ -3,7 +3,6 @@ """ import locale -import os import sys import textwrap import unittest

1 0

bpo-35250: Correct argument name "num" -> "btn" in turtle docs. (GH-10565)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/8856246c41b0663bfe8d3af7d52a7c337e… commit: 8856246c41b0663bfe8d3af7d52a7c337e25572d branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T05:56:33-08:00 summary: bpo-35250: Correct argument name "num" -> "btn" in turtle docs. (GH-10565) (cherry picked from commit 4edeaeac4c194ba5d09187640b5cfca5e03be617) Co-authored-by: Srinivas Thatiparthy (శ్రీనివాస్ తాటిపర్తి) <thatiparthysreenivas(a)gmail.com> files: M Doc/library/turtle.rst M Lib/turtle.py diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst index 2b5d3e567d6c..8135c9330e1e 100644 --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -1310,7 +1310,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1331,7 +1331,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1355,7 +1355,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1736,7 +1736,7 @@ Using screen events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding diff --git a/Lib/turtle.py b/Lib/turtle.py index 8036b7faaa82..f3b92e31cabb 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -1352,7 +1352,7 @@ def onclick(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, the coordinates of the clicked point on the canvas. - num -- the number of the mouse-button, defaults to 1 + btn -- the number of the mouse-button, defaults to 1 Example (for a TurtleScreen instance named screen) @@ -3526,7 +3526,7 @@ def onclick(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). add -- True or False. If True, new binding will be added, otherwise it will replace a former binding. @@ -3547,7 +3547,7 @@ def onrelease(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). Example (for a MyTurtle instance named joe): >>> class MyTurtle(Turtle): @@ -3572,7 +3572,7 @@ def ondrag(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). Every sequence of mouse-move-events on a turtle is preceded by a mouse-click event on that turtle.

1 0

bpo-35250: Correct argument name "num" -> "btn" in turtle docs. (GH-10565)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/0461c3b635d53e8e75145695803a2fca28… commit: 0461c3b635d53e8e75145695803a2fca288a1689 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T05:55:14-08:00 summary: bpo-35250: Correct argument name "num" -> "btn" in turtle docs. (GH-10565) (cherry picked from commit 4edeaeac4c194ba5d09187640b5cfca5e03be617) Co-authored-by: Srinivas Thatiparthy (శ్రీనివాస్ తాటిపర్తి) <thatiparthysreenivas(a)gmail.com> files: M Doc/library/turtle.rst M Lib/turtle.py diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst index 595a244342c4..175010b89906 100644 --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -1309,7 +1309,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1330,7 +1330,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1354,7 +1354,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1735,7 +1735,7 @@ Using screen events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding diff --git a/Lib/turtle.py b/Lib/turtle.py index 9db564b7eb8b..47a94f2a4702 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -1352,7 +1352,7 @@ def onclick(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, the coordinates of the clicked point on the canvas. - num -- the number of the mouse-button, defaults to 1 + btn -- the number of the mouse-button, defaults to 1 Example (for a TurtleScreen instance named screen) @@ -3526,7 +3526,7 @@ def onclick(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). add -- True or False. If True, new binding will be added, otherwise it will replace a former binding. @@ -3547,7 +3547,7 @@ def onrelease(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). Example (for a MyTurtle instance named joe): >>> class MyTurtle(Turtle): @@ -3572,7 +3572,7 @@ def ondrag(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). Every sequence of mouse-move-events on a turtle is preceded by a mouse-click event on that turtle.

1 0

bpo-35250: Correct argument name "num" -> "btn" in turtle docs. (GH-10565)
by Serhiy Storchaka 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/4edeaeac4c194ba5d09187640b5cfca5e0… commit: 4edeaeac4c194ba5d09187640b5cfca5e03be617 branch: master author: Srinivas Thatiparthy (శ్రీనివాస్ తాటిపర్తి) <thatiparthysreenivas(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-11-16T15:28:51+02:00 summary: bpo-35250: Correct argument name "num" -> "btn" in turtle docs. (GH-10565) files: M Doc/library/turtle.rst M Lib/turtle.py diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst index 83903648b427..3d90d3cbd974 100644 --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -1360,7 +1360,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1382,7 +1382,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1407,7 +1407,7 @@ Using events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding @@ -1805,7 +1805,7 @@ Using screen events :param fun: a function with two arguments which will be called with the coordinates of the clicked point on the canvas - :param num: number of the mouse-button, defaults to 1 (left mouse button) + :param btn: number of the mouse-button, defaults to 1 (left mouse button) :param add: ``True`` or ``False`` -- if ``True``, a new binding will be added, otherwise it will replace a former binding diff --git a/Lib/turtle.py b/Lib/turtle.py index 9db564b7eb8b..47a94f2a4702 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -1352,7 +1352,7 @@ def onclick(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, the coordinates of the clicked point on the canvas. - num -- the number of the mouse-button, defaults to 1 + btn -- the number of the mouse-button, defaults to 1 Example (for a TurtleScreen instance named screen) @@ -3526,7 +3526,7 @@ def onclick(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). add -- True or False. If True, new binding will be added, otherwise it will replace a former binding. @@ -3547,7 +3547,7 @@ def onrelease(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). Example (for a MyTurtle instance named joe): >>> class MyTurtle(Turtle): @@ -3572,7 +3572,7 @@ def ondrag(self, fun, btn=1, add=None): Arguments: fun -- a function with two arguments, to which will be assigned the coordinates of the clicked point on the canvas. - num -- number of the mouse-button defaults to 1 (left mouse button). + btn -- number of the mouse-button defaults to 1 (left mouse button). Every sequence of mouse-move-events on a turtle is preceded by a mouse-click event on that turtle.

1 0

Fix outdated info in datamodel about dicts (GH-9807)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/be34cb26b92e6249a1e485479bf5ff6097… commit: be34cb26b92e6249a1e485479bf5ff60979e5a6d branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T04:20:03-08:00 summary: Fix outdated info in datamodel about dicts (GH-9807) (cherry picked from commit a48e0eb9673ec96d1decb8a230331533cfb6138b) Co-authored-by: wim glenn <wim.glenn(a)gmail.com> files: M Doc/reference/datamodel.rst diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 96e35744c8ae..02319509ca37 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1452,8 +1452,8 @@ Basic customization dict insertion, O(n^2) complexity. See http://www.ocert.org/advisories/ocert-2011-003.html for details. - Changing hash values affects the iteration order of dicts, sets and - other mappings. Python has never made guarantees about this ordering + Changing hash values affects the iteration order of sets. + Python has never made guarantees about this ordering (and it typically varies between 32-bit and 64-bit builds). See also :envvar:`PYTHONHASHSEED`.

1 0

Fix outdated info in datamodel about dicts (GH-9807)
by INADA Naoki 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/a48e0eb9673ec96d1decb8a230331533cf… commit: a48e0eb9673ec96d1decb8a230331533cfb6138b branch: master author: wim glenn <wim.glenn(a)gmail.com> committer: INADA Naoki <methane(a)users.noreply.github.com> date: 2018-11-16T20:58:19+09:00 summary: Fix outdated info in datamodel about dicts (GH-9807) files: M Doc/reference/datamodel.rst diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 79fde4bdc792..7e2d2e66cac8 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1452,8 +1452,8 @@ Basic customization dict insertion, O(n^2) complexity. See http://www.ocert.org/advisories/ocert-2011-003.html for details. - Changing hash values affects the iteration order of dicts, sets and - other mappings. Python has never made guarantees about this ordering + Changing hash values affects the iteration order of sets. + Python has never made guarantees about this ordering (and it typically varies between 32-bit and 64-bit builds). See also :envvar:`PYTHONHASHSEED`.

1 0

bpo-33816: Remove outdated metaclass example (GH-7566)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/46fa7a60e08fc7486ecab726af93fa2cfe… commit: 46fa7a60e08fc7486ecab726af93fa2cfe225305 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T03:58:09-08:00 summary: bpo-33816: Remove outdated metaclass example (GH-7566) (cherry picked from commit c2ccac7b9f9a1132ca36255b0ddfeecef4371aa3) Co-authored-by: Andrés Delfino <adelfino(a)gmail.com> files: M Doc/reference/datamodel.rst diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 18067c2d09ea..abf06357e7f9 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1918,46 +1918,14 @@ becomes the :attr:`~object.__dict__` attribute of the class object. Describes the implicit ``__class__`` closure reference -Metaclass example -^^^^^^^^^^^^^^^^^ +Uses for metaclasses +^^^^^^^^^^^^^^^^^^^^ The potential uses for metaclasses are boundless. Some ideas that have been explored include enum, logging, interface checking, automatic delegation, automatic property creation, proxies, frameworks, and automatic resource locking/synchronization. -Here is an example of a metaclass that uses an :class:`collections.OrderedDict` -to remember the order that class variables are defined:: - - class OrderedClass(type): - - @classmethod - def __prepare__(metacls, name, bases, **kwds): - return collections.OrderedDict() - - def __new__(cls, name, bases, namespace, **kwds): - result = type.__new__(cls, name, bases, dict(namespace)) - result.members = tuple(namespace) - return result - - class A(metaclass=OrderedClass): - def one(self): pass - def two(self): pass - def three(self): pass - def four(self): pass - - >>> A.members - ('__module__', 'one', 'two', 'three', 'four') - -When the class definition for *A* gets executed, the process begins with -calling the metaclass's :meth:`__prepare__` method which returns an empty -:class:`collections.OrderedDict`. That mapping records the methods and -attributes of *A* as they are defined within the body of the class statement. -Once those definitions are executed, the ordered dictionary is fully populated -and the metaclass's :meth:`__new__` method gets invoked. That method builds -the new type and it saves the ordered dictionary keys in an attribute -called ``members``. - Customizing instance and subclass checks ----------------------------------------

1 0

bpo-33816: Remove outdated metaclass example (GH-7566)
by Miss Islington (bot) 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/1b80a373d104480c51cacb8b07ec3b61e2… commit: 1b80a373d104480c51cacb8b07ec3b61e21d5fa0 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-16T03:51:20-08:00 summary: bpo-33816: Remove outdated metaclass example (GH-7566) (cherry picked from commit c2ccac7b9f9a1132ca36255b0ddfeecef4371aa3) Co-authored-by: Andrés Delfino <adelfino(a)gmail.com> files: M Doc/reference/datamodel.rst diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index be9b3ad1af69..96e35744c8ae 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1999,46 +1999,14 @@ becomes the :attr:`~object.__dict__` attribute of the class object. Describes the implicit ``__class__`` closure reference -Metaclass example -^^^^^^^^^^^^^^^^^ +Uses for metaclasses +^^^^^^^^^^^^^^^^^^^^ The potential uses for metaclasses are boundless. Some ideas that have been explored include enum, logging, interface checking, automatic delegation, automatic property creation, proxies, frameworks, and automatic resource locking/synchronization. -Here is an example of a metaclass that uses an :class:`collections.OrderedDict` -to remember the order that class variables are defined:: - - class OrderedClass(type): - - @classmethod - def __prepare__(metacls, name, bases, **kwds): - return collections.OrderedDict() - - def __new__(cls, name, bases, namespace, **kwds): - result = type.__new__(cls, name, bases, dict(namespace)) - result.members = tuple(namespace) - return result - - class A(metaclass=OrderedClass): - def one(self): pass - def two(self): pass - def three(self): pass - def four(self): pass - - >>> A.members - ('__module__', 'one', 'two', 'three', 'four') - -When the class definition for *A* gets executed, the process begins with -calling the metaclass's :meth:`__prepare__` method which returns an empty -:class:`collections.OrderedDict`. That mapping records the methods and -attributes of *A* as they are defined within the body of the class statement. -Once those definitions are executed, the ordered dictionary is fully populated -and the metaclass's :meth:`__new__` method gets invoked. That method builds -the new type and it saves the ordered dictionary keys in an attribute -called ``members``. - Customizing instance and subclass checks ----------------------------------------

1 0

bpo-33816: Remove outdated metaclass example (GH-7566)
by INADA Naoki 16 Nov '18

16 Nov '18

https://github.com/python/cpython/commit/c2ccac7b9f9a1132ca36255b0ddfeecef4… commit: c2ccac7b9f9a1132ca36255b0ddfeecef4371aa3 branch: master author: Andrés Delfino <adelfino(a)gmail.com> committer: INADA Naoki <methane(a)users.noreply.github.com> date: 2018-11-16T20:41:55+09:00 summary: bpo-33816: Remove outdated metaclass example (GH-7566) files: M Doc/reference/datamodel.rst diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 24c647d1a8d2..79fde4bdc792 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1998,46 +1998,14 @@ becomes the :attr:`~object.__dict__` attribute of the class object. Describes the implicit ``__class__`` closure reference -Metaclass example -^^^^^^^^^^^^^^^^^ +Uses for metaclasses +^^^^^^^^^^^^^^^^^^^^ The potential uses for metaclasses are boundless. Some ideas that have been explored include enum, logging, interface checking, automatic delegation, automatic property creation, proxies, frameworks, and automatic resource locking/synchronization. -Here is an example of a metaclass that uses an :class:`collections.OrderedDict` -to remember the order that class variables are defined:: - - class OrderedClass(type): - - @classmethod - def __prepare__(metacls, name, bases, **kwds): - return collections.OrderedDict() - - def __new__(cls, name, bases, namespace, **kwds): - result = type.__new__(cls, name, bases, dict(namespace)) - result.members = tuple(namespace) - return result - - class A(metaclass=OrderedClass): - def one(self): pass - def two(self): pass - def three(self): pass - def four(self): pass - - >>> A.members - ('__module__', 'one', 'two', 'three', 'four') - -When the class definition for *A* gets executed, the process begins with -calling the metaclass's :meth:`__prepare__` method which returns an empty -:class:`collections.OrderedDict`. That mapping records the methods and -attributes of *A* as they are defined within the body of the class statement. -Once those definitions are executed, the ordered dictionary is fully populated -and the metaclass's :meth:`__new__` method gets invoked. That method builds -the new type and it saves the ordered dictionary keys in an attribute -called ``members``. - Customizing instance and subclass checks ----------------------------------------

1 0