Mailman 3 January 2013 - Python-checkins

Daily reference leaks (e81cad0c722a): sum=0
by solipsis＠pitrou.net Jan. 30, 2013

Jan. 30, 2013

results for e81cad0c722a on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogS0E25h', '-x']

1 0

cpython (merge 3.3 -> default): Merge
by michael.foord Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/e81cad0c722a changeset: 81839:e81cad0c722a parent: 81835:3104cad2d9e6 parent: 81838:f39b69494393 user: Michael Foord <michael(a)voidspace.org.uk> date: Tue Jan 29 23:18:48 2013 +0000 summary: Merge files: Lib/unittest/signals.py | 16 +++++++++- Lib/unittest/test/test_break.py | 32 +++++++++++++++++++++ Misc/NEWS | 3 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/Lib/unittest/signals.py b/Lib/unittest/signals.py --- a/Lib/unittest/signals.py +++ b/Lib/unittest/signals.py @@ -9,6 +9,20 @@ class _InterruptHandler(object): def __init__(self, default_handler): self.called = False + self.original_handler = default_handler + if isinstance(default_handler, int): + if default_handler == signal.SIG_DFL: + # Pretend it's signal.default_int_handler instead. + default_handler = signal.default_int_handler + elif default_handler == signal.SIG_IGN: + # Not quite the same thing as SIG_IGN, but the closest we + # can make it: do nothing. + def default_handler(unused_signum, unused_frame): + pass + else: + raise TypeError("expected SIGINT signal handler to be " + "signal.SIG_IGN, signal.SIG_DFL, or a " + "callable object") self.default_handler = default_handler def __call__(self, signum, frame): @@ -54,4 +68,4 @@ global _interrupt_handler if _interrupt_handler is not None: - signal.signal(signal.SIGINT, _interrupt_handler.default_handler) + signal.signal(signal.SIGINT, _interrupt_handler.original_handler) diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py --- a/Lib/unittest/test/test_break.py +++ b/Lib/unittest/test/test_break.py @@ -13,9 +13,12 @@ @unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " "if threads have been used") class TestBreak(unittest.TestCase): + int_handler = None def setUp(self): self._default_handler = signal.getsignal(signal.SIGINT) + if self.int_handler is not None: + signal.signal(signal.SIGINT, self.int_handler) def tearDown(self): signal.signal(signal.SIGINT, self._default_handler) @@ -72,6 +75,10 @@ def testSecondInterrupt(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") result = unittest.TestResult() unittest.installHandler() unittest.registerResult(result) @@ -121,6 +128,10 @@ def testHandlerReplacedButCalled(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") # If our handler has been replaced (is no longer installed) but is # called by the *new* handler, then it isn't safe to delay the # SIGINT and we should immediately delegate to the default handler @@ -250,3 +261,24 @@ test() self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler) + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakDefaultIntHandler(TestBreak): + int_handler = signal.default_int_handler + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalIgnored(TestBreak): + int_handler = signal.SIG_IGN + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalDefault(TestBreak): + int_handler = signal.SIG_DFL diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -250,6 +250,9 @@ - Issue #1602133: on Mac OS X a shared library build (``--enable-shared``) now fills the ``os.environ`` variable correctly. +- Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler is + set to a callable object. + - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase interface and support all mandatory methods and properties. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.3): Merge
by michael.foord Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/f39b69494393 changeset: 81838:f39b69494393 branch: 3.3 parent: 81831:49fd1c8aeca5 parent: 81837:48c5c632d212 user: Michael Foord <michael(a)voidspace.org.uk> date: Tue Jan 29 23:14:59 2013 +0000 summary: Merge files: Lib/unittest/signals.py | 16 +++++++++- Lib/unittest/test/test_break.py | 32 +++++++++++++++++++++ Misc/NEWS | 3 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/Lib/unittest/signals.py b/Lib/unittest/signals.py --- a/Lib/unittest/signals.py +++ b/Lib/unittest/signals.py @@ -9,6 +9,20 @@ class _InterruptHandler(object): def __init__(self, default_handler): self.called = False + self.original_handler = default_handler + if isinstance(default_handler, int): + if default_handler == signal.SIG_DFL: + # Pretend it's signal.default_int_handler instead. + default_handler = signal.default_int_handler + elif default_handler == signal.SIG_IGN: + # Not quite the same thing as SIG_IGN, but the closest we + # can make it: do nothing. + def default_handler(unused_signum, unused_frame): + pass + else: + raise TypeError("expected SIGINT signal handler to be " + "signal.SIG_IGN, signal.SIG_DFL, or a " + "callable object") self.default_handler = default_handler def __call__(self, signum, frame): @@ -54,4 +68,4 @@ global _interrupt_handler if _interrupt_handler is not None: - signal.signal(signal.SIGINT, _interrupt_handler.default_handler) + signal.signal(signal.SIGINT, _interrupt_handler.original_handler) diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py --- a/Lib/unittest/test/test_break.py +++ b/Lib/unittest/test/test_break.py @@ -13,9 +13,12 @@ @unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " "if threads have been used") class TestBreak(unittest.TestCase): + int_handler = None def setUp(self): self._default_handler = signal.getsignal(signal.SIGINT) + if self.int_handler is not None: + signal.signal(signal.SIGINT, self.int_handler) def tearDown(self): signal.signal(signal.SIGINT, self._default_handler) @@ -72,6 +75,10 @@ def testSecondInterrupt(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") result = unittest.TestResult() unittest.installHandler() unittest.registerResult(result) @@ -121,6 +128,10 @@ def testHandlerReplacedButCalled(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") # If our handler has been replaced (is no longer installed) but is # called by the *new* handler, then it isn't safe to delay the # SIGINT and we should immediately delegate to the default handler @@ -250,3 +261,24 @@ test() self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler) + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakDefaultIntHandler(TestBreak): + int_handler = signal.default_int_handler + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalIgnored(TestBreak): + int_handler = signal.SIG_IGN + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalDefault(TestBreak): + int_handler = signal.SIG_DFL diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -173,6 +173,9 @@ - Issue #1602133: on Mac OS X a shared library build (``--enable-shared``) now fills the ``os.environ`` variable correctly. +- Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler is + set to a callable object. + - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase interface and support all mandatory methods and properties. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Closes issue 15505. unittest.installHandler and non-callable signal handlers.
by michael.foord Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/48c5c632d212 changeset: 81837:48c5c632d212 branch: 3.2 parent: 81828:3a1ac42435f9 user: Michael Foord <michael(a)voidspace.org.uk> date: Tue Jan 29 23:07:57 2013 +0000 summary: Closes issue 15505. unittest.installHandler and non-callable signal handlers. files: Lib/unittest/signals.py | 16 +++++++++- Lib/unittest/test/test_break.py | 32 +++++++++++++++++++++ Misc/NEWS | 3 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/Lib/unittest/signals.py b/Lib/unittest/signals.py --- a/Lib/unittest/signals.py +++ b/Lib/unittest/signals.py @@ -9,6 +9,20 @@ class _InterruptHandler(object): def __init__(self, default_handler): self.called = False + self.original_handler = default_handler + if isinstance(default_handler, int): + if default_handler == signal.SIG_DFL: + # Pretend it's signal.default_int_handler instead. + default_handler = signal.default_int_handler + elif default_handler == signal.SIG_IGN: + # Not quite the same thing as SIG_IGN, but the closest we + # can make it: do nothing. + def default_handler(unused_signum, unused_frame): + pass + else: + raise TypeError("expected SIGINT signal handler to be " + "signal.SIG_IGN, signal.SIG_DFL, or a " + "callable object") self.default_handler = default_handler def __call__(self, signum, frame): @@ -54,4 +68,4 @@ global _interrupt_handler if _interrupt_handler is not None: - signal.signal(signal.SIGINT, _interrupt_handler.default_handler) + signal.signal(signal.SIGINT, _interrupt_handler.original_handler) diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py --- a/Lib/unittest/test/test_break.py +++ b/Lib/unittest/test/test_break.py @@ -13,9 +13,12 @@ @unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " "if threads have been used") class TestBreak(unittest.TestCase): + int_handler = None def setUp(self): self._default_handler = signal.getsignal(signal.SIGINT) + if self.int_handler is not None: + signal.signal(signal.SIGINT, self.int_handler) def tearDown(self): signal.signal(signal.SIGINT, self._default_handler) @@ -72,6 +75,10 @@ def testSecondInterrupt(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") result = unittest.TestResult() unittest.installHandler() unittest.registerResult(result) @@ -121,6 +128,10 @@ def testHandlerReplacedButCalled(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") # If our handler has been replaced (is no longer installed) but is # called by the *new* handler, then it isn't safe to delay the # SIGINT and we should immediately delegate to the default handler @@ -250,3 +261,24 @@ test() self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler) + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakDefaultIntHandler(TestBreak): + int_handler = signal.default_int_handler + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalIgnored(TestBreak): + int_handler = signal.SIG_IGN + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalDefault(TestBreak): + int_handler = signal.SIG_DFL diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -216,6 +216,9 @@ Library ------- +- Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler is + set to a callable object. + - Issue #12004: Fix an internal error in PyZipFile when writing an invalid Python file. Patch by Ben Morgan. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue 15505. unittest.installHandler and non callable signal handlers
by michael.foord Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/7e4c5914ba76 changeset: 81836:7e4c5914ba76 branch: 2.7 parent: 81834:c34a761d843a user: Michael Foord <michael(a)voidspace.org.uk> date: Tue Jan 29 22:59:02 2013 +0000 summary: Issue 15505. unittest.installHandler and non callable signal handlers files: Lib/unittest/signals.py | 16 +++++++++- Lib/unittest/test/test_break.py | 32 +++++++++++++++++++++ Misc/NEWS | 3 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/Lib/unittest/signals.py b/Lib/unittest/signals.py --- a/Lib/unittest/signals.py +++ b/Lib/unittest/signals.py @@ -9,6 +9,20 @@ class _InterruptHandler(object): def __init__(self, default_handler): self.called = False + self.original_handler = default_handler + if isinstance(default_handler, int): + if default_handler == signal.SIG_DFL: + # Pretend it's signal.default_int_handler instead. + default_handler = signal.default_int_handler + elif default_handler == signal.SIG_IGN: + # Not quite the same thing as SIG_IGN, but the closest we + # can make it: do nothing. + def default_handler(unused_signum, unused_frame): + pass + else: + raise TypeError("expected SIGINT signal handler to be " + "signal.SIG_IGN, signal.SIG_DFL, or a " + "callable object") self.default_handler = default_handler def __call__(self, signum, frame): @@ -54,4 +68,4 @@ global _interrupt_handler if _interrupt_handler is not None: - signal.signal(signal.SIGINT, _interrupt_handler.default_handler) + signal.signal(signal.SIGINT, _interrupt_handler.original_handler) diff --git a/Lib/unittest/test/test_break.py b/Lib/unittest/test/test_break.py --- a/Lib/unittest/test/test_break.py +++ b/Lib/unittest/test/test_break.py @@ -15,9 +15,12 @@ @unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " "if threads have been used") class TestBreak(unittest.TestCase): + int_handler = None def setUp(self): self._default_handler = signal.getsignal(signal.SIGINT) + if self.int_handler is not None: + signal.signal(signal.SIGINT, self.int_handler) def tearDown(self): signal.signal(signal.SIGINT, self._default_handler) @@ -74,6 +77,10 @@ def testSecondInterrupt(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") result = unittest.TestResult() unittest.installHandler() unittest.registerResult(result) @@ -123,6 +130,10 @@ def testHandlerReplacedButCalled(self): + # Can't use skipIf decorator because the signal handler may have + # been changed after defining this method. + if signal.getsignal(signal.SIGINT) == signal.SIG_IGN: + self.skipTest("test requires SIGINT to not be ignored") # If our handler has been replaced (is no longer installed) but is # called by the *new* handler, then it isn't safe to delay the # SIGINT and we should immediately delegate to the default handler @@ -250,3 +261,24 @@ test() self.assertNotEqual(signal.getsignal(signal.SIGINT), default_handler) + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakDefaultIntHandler(TestBreak): + int_handler = signal.default_int_handler + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalIgnored(TestBreak): + int_handler = signal.SIG_IGN + +(a)unittest.skipUnless(hasattr(os, 'kill'), "Test requires os.kill") +(a)unittest.skipIf(sys.platform =="win32", "Test cannot run on Windows") +(a)unittest.skipIf(sys.platform == 'freebsd6', "Test kills regrtest on freebsd6 " + "if threads have been used") +class TestBreakSignalDefault(TestBreak): + int_handler = signal.SIG_DFL diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -202,6 +202,9 @@ Library ------- +- Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler is + set to a callable object. + - Issue #17051: Fix a memory leak in os.path.isdir() on Windows. Patch by Robert Xiao. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix compilation error under Windows.
by vinay.sajip Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/3104cad2d9e6 changeset: 81835:3104cad2d9e6 parent: 81833:0880e0f859e0 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Tue Jan 29 22:52:57 2013 +0000 summary: Fix compilation error under Windows. files: PC/launcher.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PC/launcher.c b/PC/launcher.c --- a/PC/launcher.c +++ b/PC/launcher.c @@ -1257,8 +1257,8 @@ if (!valid) debug(L"GetFileVersionInfo failed: %X\n", GetLastError()); else { - valid = VerQueryValueW(version_data, L"\\", &file_info, - &block_size); + valid = VerQueryValueW(version_data, L"\\", + (LPVOID *) &file_info, &block_size); if (!valid) debug(L"VerQueryValue failed: %X\n", GetLastError()); else { -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Added clarification to logging HOWTO.
by vinay.sajip Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/c34a761d843a changeset: 81834:c34a761d843a branch: 2.7 parent: 81821:9137e2d1c00c user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Tue Jan 29 22:36:39 2013 +0000 summary: Added clarification to logging HOWTO. files: Doc/howto/logging.rst | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst --- a/Doc/howto/logging.rst +++ b/Doc/howto/logging.rst @@ -738,12 +738,11 @@ When developing a library which uses logging, you should take care to document how the library uses logging - for example, the names of loggers used. Some consideration also needs to be given to its logging configuration. -If the using application does not use logging, and library code makes logging -calls, then (as described in the previous section) events of severity -``WARNING`` and greater will be printed to ``sys.stderr``. This is regarded as -the best default behaviour. +If the using application does not configure logging, and library code makes +logging calls, then (as described in the previous section) an error message +will be printed to ``sys.stderr``. -If for some reason you *don't* want these messages printed in the absence of +If for some reason you *don't* want this message printed in the absence of any logging configuration, you can attach a do-nothing handler to the top-level logger for your library. This avoids the message being printed, since a handler will be always be found for the library's events: it just doesn't produce any @@ -755,7 +754,7 @@ A do-nothing handler is included in the logging package: :class:`~logging.NullHandler` (since Python 2.7). An instance of this handler could be added to the top-level logger of the logging namespace used by the -library (*if* you want to prevent your library's logged events being output to +library (*if* you want to prevent an error message being output to ``sys.stderr`` in the absence of logging configuration). If all logging by a library *foo* is done using loggers with names matching 'foo.x', 'foo.x.y', etc. then the code:: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Closes #17028: Allowed Python arguments to be supplied to launcher.
by vinay.sajip Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/0880e0f859e0 changeset: 81833:0880e0f859e0 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Tue Jan 29 22:29:25 2013 +0000 summary: Closes #17028: Allowed Python arguments to be supplied to launcher. files: PC/launcher.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/PC/launcher.c b/PC/launcher.c --- a/PC/launcher.c +++ b/PC/launcher.c @@ -1208,6 +1208,7 @@ void * version_data; VS_FIXEDFILEINFO * file_info; UINT block_size; + int index; wp = get_env(L"PYLAUNCH_DEBUG"); if ((wp != NULL) && (*wp != L'\0')) @@ -1295,13 +1296,6 @@ else { p = argv[1]; plen = wcslen(p); - if (p[0] != L'-') { - read_commands(); - maybe_handle_shebang(&argv[1], command); - } - /* No file with shebang, or an unrecognised shebang. - * Is the first arg a special version qualifier? - */ valid = (*p == L'-') && validate_version(&p[1]); if (valid) { ip = locate_python(&p[1]); @@ -1311,6 +1305,16 @@ command += wcslen(p); command = skip_whitespace(command); } + else { + for (index = 1; index < argc; ++index) { + if (*argv[index] != L'-') + break; + } + if (index < argc) { + read_commands(); + maybe_handle_shebang(&argv[index], command); + } + } } if (!valid) { ip = locate_python(L""); @@ -1329,7 +1333,7 @@ fwprintf(stdout, L"\ Python Launcher for Windows Version %s\n\n", version_text); fwprintf(stdout, L"\ -usage: %s [ launcher-arguments ] script [ script-arguments ]\n\n", argv[0]); +usage: %s [ launcher-arguments ] [ python-arguments ] script [ script-arguments ]\n\n", argv[0]); fputws(L"\ Launcher arguments:\n\n\ -2 : Launch the latest Python 2.x version\n\ @@ -1362,4 +1366,4 @@ return process(argc, argv); } -#endif \ No newline at end of file +#endif -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #17071: Signature.bind() now works when one of the keyword arguments is
by antoine.pitrou Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/4ff1dc8c0a3c changeset: 81832:4ff1dc8c0a3c parent: 81830:e24fd2c35d27 parent: 81831:49fd1c8aeca5 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Jan 29 21:21:56 2013 +0100 summary: Issue #17071: Signature.bind() now works when one of the keyword arguments is named self. files: Lib/inspect.py | 8 ++++---- Lib/test/test_inspect.py | 10 ++++++++++ Misc/NEWS | 5 ++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -2028,19 +2028,19 @@ return self._bound_arguments_cls(self, arguments) - def bind(self, *args, **kwargs): + def bind(__bind_self, *args, **kwargs): '''Get a BoundArguments object, that maps the passed `args` and `kwargs` to the function's signature. Raises `TypeError` if the passed arguments can not be bound. ''' - return self._bind(args, kwargs) + return __bind_self._bind(args, kwargs) - def bind_partial(self, *args, **kwargs): + def bind_partial(__bind_self, *args, **kwargs): '''Get a BoundArguments object, that partially maps the passed `args` and `kwargs` to the function's signature. Raises `TypeError` if the passed arguments can not be bound. ''' - return self._bind(args, kwargs, partial=True) + return __bind_self._bind(args, kwargs, partial=True) def __str__(self): result = [] 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 @@ -2241,6 +2241,16 @@ with self.assertRaisesRegex(TypeError, "parameter is positional only"): self.call(test, a_po=1, b_po=2) + def test_signature_bind_with_self_arg(self): + # Issue #17071: one of the parameters is named "self + def test(a, self, b): + pass + sig = inspect.signature(test) + ba = sig.bind(1, 2, 3) + self.assertEqual(ba.args, (1, 2, 3)) + ba = sig.bind(1, self=2, b=3) + self.assertEqual(ba.args, (1, 2, 3)) + class TestBoundArguments(unittest.TestCase): def test_signature_bound_arguments_unhashable(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -236,10 +236,13 @@ Library ------- +- Issue #17071: Signature.bind() now works when one of the keyword arguments + is named ``self``. + - Issue #12004: Fix an internal error in PyZipFile when writing an invalid Python file. Patch by Ben Morgan. -Have py_compile use importlib as much as possible to avoid code duplication. +- Have py_compile use importlib as much as possible to avoid code duplication. - Issue #180022: Have site.addpackage() consider already known paths even when none are explicitly passed in. Bug report and fix by Kirill. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #17071: Signature.bind() now works when one of the keyword arguments is
by antoine.pitrou Jan. 29, 2013

Jan. 29, 2013

http://hg.python.org/cpython/rev/49fd1c8aeca5 changeset: 81831:49fd1c8aeca5 branch: 3.3 parent: 81829:678320c7f63d user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Jan 29 21:20:57 2013 +0100 summary: Issue #17071: Signature.bind() now works when one of the keyword arguments is named ``self``. files: Lib/inspect.py | 8 ++++---- Lib/test/test_inspect.py | 10 ++++++++++ Misc/NEWS | 3 +++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -2028,19 +2028,19 @@ return self._bound_arguments_cls(self, arguments) - def bind(self, *args, **kwargs): + def bind(__bind_self, *args, **kwargs): '''Get a BoundArguments object, that maps the passed `args` and `kwargs` to the function's signature. Raises `TypeError` if the passed arguments can not be bound. ''' - return self._bind(args, kwargs) + return __bind_self._bind(args, kwargs) - def bind_partial(self, *args, **kwargs): + def bind_partial(__bind_self, *args, **kwargs): '''Get a BoundArguments object, that partially maps the passed `args` and `kwargs` to the function's signature. Raises `TypeError` if the passed arguments can not be bound. ''' - return self._bind(args, kwargs, partial=True) + return __bind_self._bind(args, kwargs, partial=True) def __str__(self): result = [] 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 @@ -2241,6 +2241,16 @@ with self.assertRaisesRegex(TypeError, "parameter is positional only"): self.call(test, a_po=1, b_po=2) + def test_signature_bind_with_self_arg(self): + # Issue #17071: one of the parameters is named "self + def test(a, self, b): + pass + sig = inspect.signature(test) + ba = sig.bind(1, 2, 3) + self.assertEqual(ba.args, (1, 2, 3)) + ba = sig.bind(1, self=2, b=3) + self.assertEqual(ba.args, (1, 2, 3)) + class TestBoundArguments(unittest.TestCase): def test_signature_bound_arguments_unhashable(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -164,6 +164,9 @@ Library ------- +- Issue #17071: Signature.bind() now works when one of the keyword arguments + is named ``self``. + - Issue #12004: Fix an internal error in PyZipFile when writing an invalid Python file. Patch by Ben Morgan. -- Repository URL: http://hg.python.org/cpython

1 0