Mailman 3 January 2020 - Python-checkins

bpo-39142: Avoid converting namedtuple instances to ConvertingTuple. (GH-17773) (GH-17786)
by Vinay Sajip Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/0e0e4acaabdcf8efb60cf75f08301022ac… commit: 0e0e4acaabdcf8efb60cf75f08301022ac4422a4 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2020-01-01T20:07:31Z summary: bpo-39142: Avoid converting namedtuple instances to ConvertingTuple. (GH-17773) (GH-17786) (cherry picked from commit 46abfc1416ff8e450999611ef8f231ff871ab133) files: A Misc/… [View More]NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst M Lib/logging/config.py M Lib/test/test_logging.py diff --git a/Lib/logging/config.py b/Lib/logging/config.py index f58be93089359..626aeea7c2c56 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -447,7 +447,7 @@ def convert(self, value): value = ConvertingList(value) value.configurator = self elif not isinstance(value, ConvertingTuple) and\ - isinstance(value, tuple): + isinstance(value, tuple) and not hasattr(value, '_fields'): value = ConvertingTuple(value) value.configurator = self elif isinstance(value, str): # str for py3k diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 546cea98c1ea4..c24a30286806a 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3223,6 +3223,37 @@ def test_baseconfig(self): self.assertRaises(ValueError, bc.convert, 'cfg://!') self.assertRaises(KeyError, bc.convert, 'cfg://adict[2]') + def test_namedtuple(self): + # see bpo-39142 + from collections import namedtuple + + class MyHandler(logging.StreamHandler): + def __init__(self, resource, *args, **kwargs): + super().__init__(*args, **kwargs) + self.resource: namedtuple = resource + + def emit(self, record): + record.msg += f' {self.resource.type}' + return super().emit(record) + + Resource = namedtuple('Resource', ['type', 'labels']) + resource = Resource(type='my_type', labels=['a']) + + config = { + 'version': 1, + 'handlers': { + 'myhandler': { + '()': MyHandler, + 'resource': resource + } + }, + 'root': {'level': 'INFO', 'handlers': ['myhandler']}, + } + with support.captured_stderr() as stderr: + self.apply_config(config) + logging.info('some log') + self.assertEqual(stderr.getvalue(), 'some log my_type\n') + class ManagerTest(BaseTest): def test_manager_loggerclass(self): logged = [] diff --git a/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst b/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst new file mode 100644 index 0000000000000..508d1338d7c31 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst @@ -0,0 +1,5 @@ +A change was made to logging.config.dictConfig to avoid converting instances +of named tuples to ConvertingTuple. It's assumed that named tuples are too +specialised to be treated like ordinary tuples; if a user of named tuples +requires ConvertingTuple functionality, they will have to implement that +themselves in their named tuple class. [View Less]

1 0

bpo-39142: Avoid converting namedtuple instances to ConvertingTuple. (GH-17773) (GH-17785)
by Vinay Sajip Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/1d5a7e5694bd9104f56f4f28357c2d13af… commit: 1d5a7e5694bd9104f56f4f28357c2d13afd58a29 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2020-01-01T20:06:52Z summary: bpo-39142: Avoid converting namedtuple instances to ConvertingTuple. (GH-17773) (GH-17785) (cherry picked from commit 46abfc1416ff8e450999611ef8f231ff871ab133) files: A Misc/… [View More]NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst M Lib/logging/config.py M Lib/test/test_logging.py diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 9dd35e11aab39..3cd5fea852449 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -447,7 +447,7 @@ def convert(self, value): value = ConvertingList(value) value.configurator = self elif not isinstance(value, ConvertingTuple) and\ - isinstance(value, tuple): + isinstance(value, tuple) and not hasattr(value, '_fields'): value = ConvertingTuple(value) value.configurator = self elif isinstance(value, str): # str for py3k diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 37655a5ccc40c..90bf2a4d3ac06 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3361,6 +3361,37 @@ def test_baseconfig(self): self.assertRaises(ValueError, bc.convert, 'cfg://!') self.assertRaises(KeyError, bc.convert, 'cfg://adict[2]') + def test_namedtuple(self): + # see bpo-39142 + from collections import namedtuple + + class MyHandler(logging.StreamHandler): + def __init__(self, resource, *args, **kwargs): + super().__init__(*args, **kwargs) + self.resource: namedtuple = resource + + def emit(self, record): + record.msg += f' {self.resource.type}' + return super().emit(record) + + Resource = namedtuple('Resource', ['type', 'labels']) + resource = Resource(type='my_type', labels=['a']) + + config = { + 'version': 1, + 'handlers': { + 'myhandler': { + '()': MyHandler, + 'resource': resource + } + }, + 'root': {'level': 'INFO', 'handlers': ['myhandler']}, + } + with support.captured_stderr() as stderr: + self.apply_config(config) + logging.info('some log') + self.assertEqual(stderr.getvalue(), 'some log my_type\n') + class ManagerTest(BaseTest): def test_manager_loggerclass(self): logged = [] diff --git a/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst b/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst new file mode 100644 index 0000000000000..508d1338d7c31 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst @@ -0,0 +1,5 @@ +A change was made to logging.config.dictConfig to avoid converting instances +of named tuples to ConvertingTuple. It's assumed that named tuples are too +specialised to be treated like ordinary tuples; if a user of named tuples +requires ConvertingTuple functionality, they will have to implement that +themselves in their named tuple class. [View Less]

1 0

bpo-39142: Avoid converting namedtuple instances to ConvertingTuple. (GH-17773)
by Vinay Sajip Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/46abfc1416ff8e450999611ef8f231ff87… commit: 46abfc1416ff8e450999611ef8f231ff871ab133 branch: master author: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> committer: GitHub <noreply(a)github.com> date: 2020-01-01T19:32:11Z summary: bpo-39142: Avoid converting namedtuple instances to ConvertingTuple. (GH-17773) This uses the heuristic of assuming a named tuple is a subclass of tuple with a _fields attribute. This change means that contents of a … [View More]named tuple wouldn't be converted - if a user wants to have ConvertingTuple functionality from a namedtuple, they will have to implement it themselves. files: A Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst M Lib/logging/config.py M Lib/test/test_logging.py diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 4a3b8966ede1c..fd3aded7608cb 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -448,7 +448,7 @@ def convert(self, value): value = ConvertingList(value) value.configurator = self elif not isinstance(value, ConvertingTuple) and\ - isinstance(value, tuple): + isinstance(value, tuple) and not hasattr(value, '_fields'): value = ConvertingTuple(value) value.configurator = self elif isinstance(value, str): # str for py3k diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 4feed03fec2a8..c38fdae03385e 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3379,6 +3379,37 @@ def test_baseconfig(self): self.assertRaises(ValueError, bc.convert, 'cfg://!') self.assertRaises(KeyError, bc.convert, 'cfg://adict[2]') + def test_namedtuple(self): + # see bpo-39142 + from collections import namedtuple + + class MyHandler(logging.StreamHandler): + def __init__(self, resource, *args, **kwargs): + super().__init__(*args, **kwargs) + self.resource: namedtuple = resource + + def emit(self, record): + record.msg += f' {self.resource.type}' + return super().emit(record) + + Resource = namedtuple('Resource', ['type', 'labels']) + resource = Resource(type='my_type', labels=['a']) + + config = { + 'version': 1, + 'handlers': { + 'myhandler': { + '()': MyHandler, + 'resource': resource + } + }, + 'root': {'level': 'INFO', 'handlers': ['myhandler']}, + } + with support.captured_stderr() as stderr: + self.apply_config(config) + logging.info('some log') + self.assertEqual(stderr.getvalue(), 'some log my_type\n') + class ManagerTest(BaseTest): def test_manager_loggerclass(self): logged = [] diff --git a/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst b/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst new file mode 100644 index 0000000000000..508d1338d7c31 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-12-31-19-27-23.bpo-39142.oqU5iD.rst @@ -0,0 +1,5 @@ +A change was made to logging.config.dictConfig to avoid converting instances +of named tuples to ConvertingTuple. It's assumed that named tuples are too +specialised to be treated like ordinary tuples; if a user of named tuples +requires ConvertingTuple functionality, they will have to implement that +themselves in their named tuple class. [View Less]

1 0

Document CodeType.replace (GH-17776)
by Miss Islington (bot) Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/dad526eb36530186f625a2724c8835fe3d… commit: dad526eb36530186f625a2724c8835fe3df3c8c1 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-12-31T22:27:56-08:00 summary: Document CodeType.replace (GH-17776) (cherry picked from commit 22424c02e51fab3b62cbe255d0b87d1b55b9a6c3) Co-authored-by: Anthony Sottile <asottile(a)umich.edu> files: M Doc/… [View More]library/types.rst M Objects/clinic/codeobject.c.h M Objects/codeobject.c diff --git a/Doc/library/types.rst b/Doc/library/types.rst index 9393f9e6db990..3529c2b0edb89 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -132,7 +132,7 @@ Standard names are defined for the following types: .. versionadded:: 3.6 -.. data:: CodeType +.. class:: CodeType(**kwargs) .. index:: builtin: compile @@ -143,6 +143,12 @@ Standard names are defined for the following types: Note that the audited arguments may not match the names or positions required by the initializer. + .. method:: CodeType.replace(**kwargs) + + Return a copy of the code object with new values for the specified fields. + + .. versionadded:: 3.8 + .. data:: CellType The type for cell objects: such objects are used as containers for diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h index 6596de051cacb..1dd82278cf3d5 100644 --- a/Objects/clinic/codeobject.c.h +++ b/Objects/clinic/codeobject.c.h @@ -11,7 +11,7 @@ PyDoc_STRVAR(code_replace__doc__, " co_lnotab=None)\n" "--\n" "\n" -"Return a new code object with new specified fields."); +"Return a copy of the code object with new values for the specified fields."); #define CODE_REPLACE_METHODDEF \ {"replace", (PyCFunction)(void(*)(void))code_replace, METH_FASTCALL|METH_KEYWORDS, code_replace__doc__}, @@ -253,4 +253,4 @@ code_replace(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje exit: return return_value; } -/*[clinic end generated code: output=fade581d6313a0c2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=27fe34e82106b220 input=a9049054013a1b77]*/ diff --git a/Objects/codeobject.c b/Objects/codeobject.c index f0b62ec94148d..522e1a9f2a419 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -610,7 +610,7 @@ code.replace co_name: unicode(c_default="self->co_name") = None co_lnotab: PyBytesObject(c_default="(PyBytesObject *)self->co_lnotab") = None -Return a new code object with new specified fields. +Return a copy of the code object with new values for the specified fields. [clinic start generated code]*/ static PyObject * @@ -622,7 +622,7 @@ code_replace_impl(PyCodeObject *self, int co_argcount, PyObject *co_varnames, PyObject *co_freevars, PyObject *co_cellvars, PyObject *co_filename, PyObject *co_name, PyBytesObject *co_lnotab) -/*[clinic end generated code: output=25c8e303913bcace input=77189e46579ec426]*/ +/*[clinic end generated code: output=25c8e303913bcace input=d9051bc8f24e6b28]*/ { #define CHECK_INT_ARG(ARG) \ if (ARG < 0) { \ [View Less]

1 0

Document CodeType.replace (GH-17776)
by Pablo Galindo Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/22424c02e51fab3b62cbe255d0b87d1b55… commit: 22424c02e51fab3b62cbe255d0b87d1b55b9a6c3 branch: master author: Anthony Sottile <asottile(a)umich.edu> committer: Pablo Galindo <Pablogsal(a)gmail.com> date: 2020-01-01T06:11:16Z summary: Document CodeType.replace (GH-17776) files: M Doc/library/types.rst M Objects/clinic/codeobject.c.h M Objects/codeobject.c diff --git a/Doc/library/types.rst b/Doc/library/types.rst index 9393f9e6db990..… [View More]3529c2b0edb89 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -132,7 +132,7 @@ Standard names are defined for the following types: .. versionadded:: 3.6 -.. data:: CodeType +.. class:: CodeType(**kwargs) .. index:: builtin: compile @@ -143,6 +143,12 @@ Standard names are defined for the following types: Note that the audited arguments may not match the names or positions required by the initializer. + .. method:: CodeType.replace(**kwargs) + + Return a copy of the code object with new values for the specified fields. + + .. versionadded:: 3.8 + .. data:: CellType The type for cell objects: such objects are used as containers for diff --git a/Objects/clinic/codeobject.c.h b/Objects/clinic/codeobject.c.h index 6596de051cacb..1dd82278cf3d5 100644 --- a/Objects/clinic/codeobject.c.h +++ b/Objects/clinic/codeobject.c.h @@ -11,7 +11,7 @@ PyDoc_STRVAR(code_replace__doc__, " co_lnotab=None)\n" "--\n" "\n" -"Return a new code object with new specified fields."); +"Return a copy of the code object with new values for the specified fields."); #define CODE_REPLACE_METHODDEF \ {"replace", (PyCFunction)(void(*)(void))code_replace, METH_FASTCALL|METH_KEYWORDS, code_replace__doc__}, @@ -253,4 +253,4 @@ code_replace(PyCodeObject *self, PyObject *const *args, Py_ssize_t nargs, PyObje exit: return return_value; } -/*[clinic end generated code: output=fade581d6313a0c2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=27fe34e82106b220 input=a9049054013a1b77]*/ diff --git a/Objects/codeobject.c b/Objects/codeobject.c index f0b62ec94148d..522e1a9f2a419 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -610,7 +610,7 @@ code.replace co_name: unicode(c_default="self->co_name") = None co_lnotab: PyBytesObject(c_default="(PyBytesObject *)self->co_lnotab") = None -Return a new code object with new specified fields. +Return a copy of the code object with new values for the specified fields. [clinic start generated code]*/ static PyObject * @@ -622,7 +622,7 @@ code_replace_impl(PyCodeObject *self, int co_argcount, PyObject *co_varnames, PyObject *co_freevars, PyObject *co_cellvars, PyObject *co_filename, PyObject *co_name, PyBytesObject *co_lnotab) -/*[clinic end generated code: output=25c8e303913bcace input=77189e46579ec426]*/ +/*[clinic end generated code: output=25c8e303913bcace input=d9051bc8f24e6b28]*/ { #define CHECK_INT_ARG(ARG) \ if (ARG < 0) { \ [View Less]

1 0

bpo-39176: Improve error message for 'named assignment' (GH-17777) (GH-17778)
by Raymond Hettinger Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/6c004955aceb8a0cd8e14afbc608ebfdf7… commit: 6c004955aceb8a0cd8e14afbc608ebfdf7c8aa4a branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2019-12-31T21:28:08-06:00 summary: bpo-39176: Improve error message for 'named assignment' (GH-17777) (GH-17778) (cherry picked from commit 37143a8e3b2e9245d52f4ddebbdd1c6121c96884) Co-… [View More]authored-by: Ned Batchelder <ned(a)nedbatchelder.com> Co-authored-by: Ned Batchelder <ned(a)nedbatchelder.com> files: M Lib/test/test_named_expressions.py M Lib/test/test_syntax.py M Python/ast.c diff --git a/Lib/test/test_named_expressions.py b/Lib/test/test_named_expressions.py index 01e26c8dfaf25..3ae557f78d273 100644 --- a/Lib/test/test_named_expressions.py +++ b/Lib/test/test_named_expressions.py @@ -32,7 +32,7 @@ def test_named_expression_invalid_04(self): def test_named_expression_invalid_06(self): code = """((a, b) := (1, 2))""" - with self.assertRaisesRegex(SyntaxError, "cannot use named assignment with tuple"): + with self.assertRaisesRegex(SyntaxError, "cannot use assignment expressions with tuple"): exec(code, {}, {}) def test_named_expression_invalid_07(self): @@ -90,7 +90,7 @@ def test_named_expression_invalid_15(self): code = """(lambda: x := 1)""" with self.assertRaisesRegex(SyntaxError, - "cannot use named assignment with lambda"): + "cannot use assignment expressions with lambda"): exec(code, {}, {}) def test_named_expression_invalid_16(self): diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 3829746f1799a..128c4da143841 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -45,7 +45,7 @@ >>> (True := 1) Traceback (most recent call last): -SyntaxError: cannot use named assignment with True +SyntaxError: cannot use assignment expressions with True >>> obj.__debug__ = 1 Traceback (most recent call last): diff --git a/Python/ast.c b/Python/ast.c index e70ab519e66e1..6cf71ce7bb810 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -1955,7 +1955,7 @@ ast_for_namedexpr(struct compiling *c, const node *n) if (target->kind != Name_kind) { const char *expr_name = get_expr_name(target); if (expr_name != NULL) { - ast_error(c, n, "cannot use named assignment with %s", expr_name); + ast_error(c, n, "cannot use assignment expressions with %s", expr_name); } return NULL; } [View Less]

1 0

bpo-39176: Improve error message for 'named assignment' (GH-17777)
by Raymond Hettinger Jan. 1, 2020

Jan. 1, 2020

https://github.com/python/cpython/commit/37143a8e3b2e9245d52f4ddebbdd1c6121… commit: 37143a8e3b2e9245d52f4ddebbdd1c6121c96884 branch: master author: Ned Batchelder <ned(a)nedbatchelder.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2019-12-31T20:40:58-06:00 summary: bpo-39176: Improve error message for 'named assignment' (GH-17777) files: M Lib/test/test_named_expressions.py M Lib/test/test_syntax.py M Python/ast.c diff --git a/Lib/test/… [View More]

1 0