Mailman 3 March 2013 - Python-checkins

cpython (merge 3.3 -> default): Merge #17435: Don't use mutable default values in Timer.
by r.david.murray March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/8c15e57830dd changeset: 83030:8c15e57830dd parent: 83026:411e5726f84d parent: 83029:2698920eadcd user: R David Murray <rdmurray(a)bitdance.com> date: Sat Mar 30 17:22:30 2013 -0400 summary: Merge #17435: Don't use mutable default values in Timer. Patch by Denver Coneybeare with some test modifications by me. files: Doc/library/threading.rst | 4 ++- Lib/test/test_threading.py | 39 ++++++++++++++++++-------- Lib/threading.py | 8 ++-- Misc/NEWS | 3 ++ 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -839,10 +839,12 @@ t.start() # after 30 seconds, "hello, world" will be printed -.. class:: Timer(interval, function, args=[], kwargs={}) +.. class:: Timer(interval, function, args=None, kwargs=None) Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. + If *args* is None (the default) then an empty list will be used. + If *kwargs* is None (the default) then an empty dict will be used. .. versionchanged:: 3.3 changed from a factory function to a class. diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -787,6 +787,32 @@ self.assertEqual(p.returncode, 0, "Unexpected error: " + stderr.decode()) self.assertEqual(data, expected_output) +class TimerTests(BaseTestCase): + + def setUp(self): + BaseTestCase.setUp(self) + self.callback_args = [] + self.callback_event = threading.Event() + + def test_init_immutable_default_args(self): + # Issue 17435: constructor defaults were mutable objects, they could be + # mutated via the object attributes and affect other Timer objects. + timer1 = threading.Timer(0.01, self._callback_spy) + timer1.start() + self.callback_event.wait() + timer1.args.append("blah") + timer1.kwargs["foo"] = "bar" + self.callback_event.clear() + timer2 = threading.Timer(0.01, self._callback_spy) + timer2.start() + self.callback_event.wait() + self.assertEqual(len(self.callback_args), 2) + self.assertEqual(self.callback_args, [((), {}), ((), {})]) + + def _callback_spy(self, *args, **kwargs): + self.callback_args.append((args[:], kwargs.copy())) + self.callback_event.set() + class LockTests(lock_tests.LockTests): locktype = staticmethod(threading.Lock) @@ -816,16 +842,5 @@ class BarrierTests(lock_tests.BarrierTests): barriertype = staticmethod(threading.Barrier) - -def test_main(): - test.support.run_unittest(LockTests, PyRLockTests, CRLockTests, EventTests, - ConditionAsRLockTests, ConditionTests, - SemaphoreTests, BoundedSemaphoreTests, - ThreadTests, - ThreadJoinOnShutdown, - ThreadingExceptionTests, - BarrierTests, - ) - if __name__ == "__main__": - test_main() + unittest.main() diff --git a/Lib/threading.py b/Lib/threading.py --- a/Lib/threading.py +++ b/Lib/threading.py @@ -807,17 +807,17 @@ class Timer(Thread): """Call a function after a specified number of seconds: - t = Timer(30.0, f, args=[], kwargs={}) + t = Timer(30.0, f, args=None, kwargs=None) t.start() t.cancel() # stop the timer's action if it's still waiting """ - def __init__(self, interval, function, args=[], kwargs={}): + def __init__(self, interval, function, args=None, kwargs=None): Thread.__init__(self) self.interval = interval self.function = function - self.args = args - self.kwargs = kwargs + self.args = args if args is not None else [] + self.kwargs = kwargs if kwargs is not None else {} self.finished = Event() def cancel(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -297,6 +297,9 @@ Library ------- +- Issue #17435: threading.Timer's __init__ method no longer uses mutable + default values for the args and kwargs parameters. + - Issue #17526: fix an IndexError raised while passing code without filename to inspect.findsource(). Initial patch by Tyler Doyle. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #17435: Don't use mutable default values in Timer.
by r.david.murray March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/2698920eadcd changeset: 83029:2698920eadcd branch: 3.3 parent: 83013:7fd5d9fe9f71 user: R David Murray <rdmurray(a)bitdance.com> date: Sat Mar 30 17:19:38 2013 -0400 summary: Issue #17435: Don't use mutable default values in Timer. Patch by Denver Coneybeare with some test modifications by me. files: Doc/library/threading.rst | 4 ++- Lib/test/test_threading.py | 39 ++++++++++++++++++-------- Lib/threading.py | 8 ++-- Misc/NEWS | 3 ++ 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -839,10 +839,12 @@ t.start() # after 30 seconds, "hello, world" will be printed -.. class:: Timer(interval, function, args=[], kwargs={}) +.. class:: Timer(interval, function, args=None, kwargs=None) Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. + If *args* is None (the default) then an empty list will be used. + If *kwargs* is None (the default) then an empty dict will be used. .. versionchanged:: 3.3 changed from a factory function to a class. diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -786,6 +786,32 @@ self.assertEqual(p.returncode, 0, "Unexpected error: " + stderr.decode()) self.assertEqual(data, expected_output) +class TimerTests(BaseTestCase): + + def setUp(self): + BaseTestCase.setUp(self) + self.callback_args = [] + self.callback_event = threading.Event() + + def test_init_immutable_default_args(self): + # Issue 17435: constructor defaults were mutable objects, they could be + # mutated via the object attributes and affect other Timer objects. + timer1 = threading.Timer(0.01, self._callback_spy) + timer1.start() + self.callback_event.wait() + timer1.args.append("blah") + timer1.kwargs["foo"] = "bar" + self.callback_event.clear() + timer2 = threading.Timer(0.01, self._callback_spy) + timer2.start() + self.callback_event.wait() + self.assertEqual(len(self.callback_args), 2) + self.assertEqual(self.callback_args, [((), {}), ((), {})]) + + def _callback_spy(self, *args, **kwargs): + self.callback_args.append((args[:], kwargs.copy())) + self.callback_event.set() + class LockTests(lock_tests.LockTests): locktype = staticmethod(threading.Lock) @@ -815,16 +841,5 @@ class BarrierTests(lock_tests.BarrierTests): barriertype = staticmethod(threading.Barrier) - -def test_main(): - test.support.run_unittest(LockTests, PyRLockTests, CRLockTests, EventTests, - ConditionAsRLockTests, ConditionTests, - SemaphoreTests, BoundedSemaphoreTests, - ThreadTests, - ThreadJoinOnShutdown, - ThreadingExceptionTests, - BarrierTests, - ) - if __name__ == "__main__": - test_main() + unittest.main() diff --git a/Lib/threading.py b/Lib/threading.py --- a/Lib/threading.py +++ b/Lib/threading.py @@ -802,17 +802,17 @@ class Timer(Thread): """Call a function after a specified number of seconds: - t = Timer(30.0, f, args=[], kwargs={}) + t = Timer(30.0, f, args=None, kwargs=None) t.start() t.cancel() # stop the timer's action if it's still waiting """ - def __init__(self, interval, function, args=[], kwargs={}): + def __init__(self, interval, function, args=None, kwargs=None): Thread.__init__(self) self.interval = interval self.function = function - self.args = args - self.kwargs = kwargs + self.args = args if args is not None else [] + self.kwargs = kwargs if kwargs is not None else {} self.finished = Event() def cancel(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,9 @@ Library ------- +- Issue #17435: threading.Timer's __init__ method no longer uses mutable + default values for the args and kwargs parameters. + - Issue #17526: fix an IndexError raised while passing code without filename to inspect.findsource(). Initial patch by Tyler Doyle. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge 2.7.4 release branch
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/f3032825f637 changeset: 83028:f3032825f637 branch: 2.7 parent: 83020:bf5ff2a58096 parent: 83027:be0586ebb842 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Mar 30 15:31:31 2013 -0400 summary: merge 2.7.4 release branch files: Lib/test/pickletester.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -11,7 +11,7 @@ from test.test_support import _2G, _1M, precisionbigmemtest except ImportError: # this import might fail when run on older Python versions by test_xpickle - _2G = _1G = 0 + _2G = _1M = 0 def precisionbigmemtest(*args, **kwargs): return lambda self: None -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): G -> M (closes #17533)
by benjamin.peterson March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/be0586ebb842 changeset: 83027:be0586ebb842 branch: 2.7 parent: 83019:de48977f9289 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Mar 30 15:30:28 2013 -0400 summary: G -> M (closes #17533) files: Lib/test/pickletester.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -11,7 +11,7 @@ from test.test_support import _2G, _1M, precisionbigmemtest except ImportError: # this import might fail when run on older Python versions by test_xpickle - _2G = _1G = 0 + _2G = _1M = 0 def precisionbigmemtest(*args, **kwargs): return lambda self: None -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Update the devguide to reflect workflow changes as a result of
by ned.deily March 30, 2013

March 30, 2013

http://hg.python.org/devguide/rev/e125591a5f12 changeset: 615:e125591a5f12 user: Ned Deily <nad(a)acm.org> date: Sat Mar 30 12:11:37 2013 -0700 summary: Update the devguide to reflect workflow changes as a result of the 3.2 branch changing to security-fix-only mode. files: committing.rst | 21 ++++++++------------- devcycle.rst | 17 +++++++++-------- faq.rst | 14 +++++++------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/committing.rst b/committing.rst --- a/committing.rst +++ b/committing.rst @@ -320,15 +320,10 @@ $ hg import --no-c http://bugs.python.org/url/to/the/patch.diff $ # review, run tests, run `make patchcheck` $ hg ci -m '#12345: fix some issue.' - $ # switch to 3.2 and port the changeset using `hg graft` - $ cd ../3.2 + $ # switch to 3.3 and port the changeset using `hg graft` + $ cd ../3.3 $ hg up $ hg graft 2.7 - $ # switch to 3.3, merge, and commit - $ cd ../3.3 - $ hg up - $ hg merge 3.2 - $ hg ci -m '#12345: merge with 3.2.' $ # switch to 3.x, merge, commit, and push everything $ cd ../3.x $ hg up @@ -404,13 +399,13 @@ Porting changesets between the two major Python versions (2.x and 3.x) ---------------------------------------------------------------------- -Assume you just committed something on ``2.7``, and want to port it to ``3.2``. +Assume you just committed something on ``2.7``, and want to port it to ``3.3``. You can use ``hg graft`` as follow:: - cd ../3.2 + cd ../3.3 hg graft 2.7 -This will port the latest changeset committed in the 2.7 clone to the 3.2 clone. +This will port the latest changeset committed in the 2.7 clone to the 3.3 clone. ``hg graft`` always commits automatically, except in case of conflicts, when you have to resolve them and run ``hg graft --continue`` afterwards. Instead of the branch name you can also specify a changeset id, and you can @@ -418,15 +413,15 @@ On older version of Mercurial where ``hg graft`` is not available, you can use:: - cd ../3.2 + cd ../3.3 hg export 2.7 | hg import - The result will be the same, but in case of conflict this will create ``.rej`` files rather than using Mercurial merge capabilities. -A third option is to apply manually the patch on ``3.2``. This is convenient +A third option is to apply manually the patch on ``3.3``. This is convenient when there are too many differences with ``2.7`` or when there is already a -specific patch for ``3.2``. +specific patch for ``3.3``. .. warning:: Never use ``hg merge`` to port changes between 2.x and 3.x (or vice versa). diff --git a/devcycle.rst b/devcycle.rst --- a/devcycle.rst +++ b/devcycle.rst @@ -31,12 +31,12 @@ '''''''' There is a branch for each *feature version*, whether released or not (e.g. -2.7, 3.2, 3.3). Development is handled separately for Python 2 and Python 3: +2.7, 3.3). Development is handled separately for Python 2 and Python 3: no merging happens between 2.x and 3.x branches. In each of the 2.x and 3.x realms, the branch for a feature version is always a -descendant of the previous feature version: for example, the ``3.2`` branch is a -descendant of the ``3.1`` branch. +descendant of the previous feature version: for example, the ``3.3`` branch is a +descendant of the ``3.2`` branch. Therefore, each change should be made **first** in the oldest branch to which it applies and forward-ported as appropriate: if a bug must be fixed in both Python @@ -77,10 +77,12 @@ discussed first. Sometime after a new maintenance branch is created (after a new *minor version* -is released), the old maintenance branch on that major version (e.g. 3.2.x -after 3.3 gets released) will go into :ref:`security mode <secbranch>`, +is released), the old maintenance branch on that major version will go into +:ref:`security mode <secbranch>`, usually after one last maintenance release at the discretion of the -release manager. +release manager. For example, the 3.2 maintenance branch was put into +:ref:`security mode <secbranch>` after the 3.2.4 final maintenance release +following the release of 3.3.0. .. _secbranch: @@ -107,8 +109,7 @@ - the ``default`` branch holds the future 3.4 version and descends from ``3.3`` - the ``3.3`` branch holds bug fixes for future 3.3.x maintenance releases and descends from ``3.2`` -- the ``3.2`` branch holds bug fixes for an upcoming final 3.2.4 maintenance - release and then for future 3.2.x security releases +- the ``3.2`` branch holds security fixes for future 3.2.x security releases - the ``3.1`` branch holds security fixes for future 3.1.x security releases - the ``2.7`` branch holds bug fixes for future 2.7.x maintenance releases and descends from ``2.6`` diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -174,7 +174,7 @@ git clone git://github.com/akheron/cpython The mirror's master branch tracks the main repository's default branch, -while the maintenance branch names (``2.7``, ``3.2``, etc) are mapped +while the maintenance branch names (``2.7``, ``3.3``, etc) are mapped directly. .. _git mirror: http://github.com/akheron/cpython @@ -796,14 +796,14 @@ How do I make a null merge? ''''''''''''''''''''''''''' -If you committed something (e.g. on 3.2) that shouldn't be ported on newer -branches (e.g. on 3.3), you have to do a *null merge*:: +If you committed something (e.g. on 3.3) that shouldn't be ported on newer +branches (e.g. on default), you have to do a *null merge*:: - cd 3.3 - hg merge 3.2 - hg revert -ar 3.3 + cd 3.x + hg merge 3.3 + hg revert -ar default hg resolve -am # needed only if the merge created conflicts - hg ci -m '#12345: null merge with 3.2.' + hg ci -m '#12345: null merge with 3.3.' Before committing, ``hg status`` should list all the merged files as ``M``, but ``hg diff`` should produce no output. This will record the merge without -- Repository URL: http://hg.python.org/devguide

1 0

cpython: Fix comment about the OpenSSL version in which SNI version was introduced.
by antoine.pitrou March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/411e5726f84d changeset: 83026:411e5726f84d user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Mar 30 16:45:04 2013 +0100 summary: Fix comment about the OpenSSL version in which SNI version was introduced. files: Modules/_ssl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -95,7 +95,7 @@ # define HAVE_TLSv1_2 0 #endif -/* SNI support (client- and server-side) appeared in OpenSSL 0.9.8n. +/* SNI support (client- and server-side) appeared in OpenSSL 1.0.0. * This includes the SSL_set_SSL_CTX() function. */ #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Improve set_servername_callback docstring.
by antoine.pitrou March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/b45630913715 changeset: 83025:b45630913715 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Mar 30 16:40:27 2013 +0100 summary: Improve set_servername_callback docstring. files: Modules/_ssl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2503,13 +2503,13 @@ PyDoc_STRVAR(PySSL_set_servername_callback_doc, "set_servername_callback(method)\n\ -\ +\n\ This sets a callback that will be called when a server name is provided by\n\ the SSL/TLS client in the SNI extension.\n\ -\ +\n\ If the argument is None then the callback is disabled. The method is called\n\ with the SSLSocket, the server name as a string, and the SSLContext object.\n\ -See RFC 6066 for details of the SNI"); +See RFC 6066 for details of the SNI extension."); static PyObject * set_servername_callback(PySSLContext *self, PyObject *args) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix previous fix (the cause was actually a misplaced #endif, or so it seems)
by antoine.pitrou March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/fc4f68b51ba0 changeset: 83024:fc4f68b51ba0 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Mar 30 16:39:00 2013 +0100 summary: Fix previous fix (the cause was actually a misplaced #endif, or so it seems) files: Modules/_ssl.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2499,6 +2499,7 @@ #endif return ret; } +#endif PyDoc_STRVAR(PySSL_set_servername_callback_doc, "set_servername_callback(method)\n\ @@ -2509,7 +2510,6 @@ If the argument is None then the callback is disabled. The method is called\n\ with the SSLSocket, the server name as a string, and the SSLContext object.\n\ See RFC 6066 for details of the SNI"); -#endif static PyObject * set_servername_callback(PySSLContext *self, PyObject *args) @@ -2575,10 +2575,8 @@ {"set_ecdh_curve", (PyCFunction) set_ecdh_curve, METH_O, NULL}, #endif -#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) {"set_servername_callback", (PyCFunction) set_servername_callback, METH_VARARGS, PySSL_set_servername_callback_doc}, -#endif {NULL, NULL} /* sentinel */ }; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Further compiling fixes (issue #17581)
by antoine.pitrou March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/ad9effdc0ac3 changeset: 83023:ad9effdc0ac3 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Mar 30 16:36:54 2013 +0100 summary: Further compiling fixes (issue #17581) files: Modules/_ssl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1207,7 +1207,7 @@ #if !HAVE_SNI PyErr_SetString(PyExc_NotImplementedError, "setting a socket's " "context is not supported by your OpenSSL library"); - return NULL; + return -1; #else Py_INCREF(value); Py_DECREF(self->ctx); @@ -2542,6 +2542,7 @@ "The TLS extension servername callback, " "SSL_CTX_set_tlsext_servername_callback, " "is not in the current OpenSSL library."); + return NULL; #endif } @@ -2574,8 +2575,10 @@ {"set_ecdh_curve", (PyCFunction) set_ecdh_curve, METH_O, NULL}, #endif +#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) {"set_servername_callback", (PyCFunction) set_servername_callback, METH_VARARGS, PySSL_set_servername_callback_doc}, +#endif {NULL, NULL} /* sentinel */ }; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge
by antoine.pitrou March 30, 2013

March 30, 2013

http://hg.python.org/cpython/rev/096a97f3ffc9 changeset: 83022:096a97f3ffc9 parent: 83021:02f9335b7efb parent: 83014:efb44458afcd user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Mar 30 16:29:54 2013 +0100 summary: Merge files: Doc/howto/logging-cookbook.rst | 34 ++++++++++++++ Doc/library/unittest.mock-examples.rst | 6 +- Lib/inspect.py | 2 +- Lib/test/test_inspect.py | 6 ++ Misc/NEWS | 3 + 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1094,6 +1094,40 @@ string. That's because the __ notation is just syntax sugar for a constructor call to one of the XXXMessage classes. +If you prefer, you can use a :class:`LoggerAdapter` to achieve a similar effect +to the above, as in the following example:: + + import logging + + class Message(object): + def __init__(self, fmt, args): + self.fmt = fmt + self.args = args + + def __str__(self): + return self.fmt.format(*self.args) + + class StyleAdapter(logging.LoggerAdapter): + def __init__(self, logger, extra=None): + super(StyleAdapter, self).__init__(logger, extra or {}) + + def log(self, level, msg, *args, **kwargs): + if self.isEnabledFor(level): + msg, kwargs = self.process(msg, kwargs) + self.logger._log(level, Message(msg, args), (), **kwargs) + + logger = StyleAdapter(logging.getLogger(__name__)) + + def main(): + logger.debug('Hello, {}', 'world!') + + if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + main() + +The above script should log the message ``Hello, world!`` when run with +Python 3.2 or later. + .. currentmodule:: logging diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst --- a/Doc/library/unittest.mock-examples.rst +++ b/Doc/library/unittest.mock-examples.rst @@ -338,11 +338,11 @@ ... >>> test() -If you are patching a module (including `__builtin__`) then use `patch` +If you are patching a module (including :mod:`builtins`) then use `patch` instead of `patch.object`: - >>> mock = MagicMock(return_value = sentinel.file_handle) - >>> with patch('__builtin__.open', mock): + >>> mock = MagicMock(return_value=sentinel.file_handle) + >>> with patch('builtins.open', mock): ... handle = open('filename', 'r') ... >>> mock.assert_called_with('filename', 'r') diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -550,7 +550,7 @@ file = getfile(object) sourcefile = getsourcefile(object) - if not sourcefile and file[0] + file[-1] != '<>': + if not sourcefile and file[:1] + file[-1:] != '<>': raise OSError('source code not available') file = sourcefile if sourcefile else file diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -416,6 +416,12 @@ finally: del linecache.cache[co.co_filename] + def test_findsource_without_filename(self): + for fname in ['', '<string>']: + co = compile('x=1', fname, "exec") + self.assertRaises(IOError, inspect.findsource, co) + self.assertRaises(IOError, inspect.getsource, co) + class TestNoEOL(GetSourceBase): def __init__(self, *args, **kwargs): self.tempdir = TESTFN + '_dir' diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -297,6 +297,9 @@ Library ------- +- Issue #17526: fix an IndexError raised while passing code without filename to + inspect.findsource(). Initial patch by Tyler Doyle. + - Issue #17540: Added style to formatter configuration by dict. - Issue #16692: The ssl module now supports TLS 1.1 and TLS 1.2. Initial -- Repository URL: http://hg.python.org/cpython

1 0