Mailman 3 November 2013 - Python-checkins

cpython (3.3): Issue #19595: Re-enable a long-disabled test in test_winsound
by zach.ware 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/63f3e8670fa6 changeset: 87645:63f3e8670fa6 branch: 3.3 parent: 87641:9d0dc3d7bf01 user: Zachary Ware <zachary.ware(a)gmail.com> date: Wed Nov 27 23:56:04 2013 -0600 summary: Issue #19595: Re-enable a long-disabled test in test_winsound files: Lib/test/test_winsound.py | 20 ++++++++------------ Misc/NEWS | 2 ++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -158,18 +158,14 @@ ) def test_alias_fallback(self): - # This test can't be expected to work on all systems. The MS - # PlaySound() docs say: - # - # If it cannot find the specified sound, PlaySound uses the - # default system event sound entry instead. If the function - # can find neither the system default entry nor the default - # sound, it makes no sound and returns FALSE. - # - # It's known to return FALSE on some real systems. - - # winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) - return + if _have_soundcard(): + winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) + else: + self.assertRaises( + RuntimeError, + winsound.PlaySound, + '!"$%&/(#+*', winsound.SND_ALIAS + ) def test_alias_nofallback(self): if _have_soundcard(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -70,6 +70,8 @@ Tests ----- +- Issue #19595: Re-enabled a long-disabled test in test_winsound. + - Issue #19588: Fixed tests in test_random that were silently skipped most of the time. Patch by Julian Gindi. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19595: Re-enable a long-disabled test in test_winsound
by zach.ware 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/30b3798782f1 changeset: 87644:30b3798782f1 branch: 2.7 parent: 87633:f51ca196d77a user: Zachary Ware <zachary.ware(a)gmail.com> date: Wed Nov 27 23:56:04 2013 -0600 summary: Issue #19595: Re-enable a long-disabled test in test_winsound files: Lib/test/test_winsound.py | 20 ++++++++------------ Misc/NEWS | 2 ++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -159,18 +159,14 @@ ) def test_alias_fallback(self): - # This test can't be expected to work on all systems. The MS - # PlaySound() docs say: - # - # If it cannot find the specified sound, PlaySound uses the - # default system event sound entry instead. If the function - # can find neither the system default entry nor the default - # sound, it makes no sound and returns FALSE. - # - # It's known to return FALSE on some real systems. - - # winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) - return + if _have_soundcard(): + winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) + else: + self.assertRaises( + RuntimeError, + winsound.PlaySound, + '!"$%&/(#+*', winsound.SND_ALIAS + ) def test_alias_nofallback(self): if _have_soundcard(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -53,6 +53,8 @@ Tests ----- +- Issue #19595: Re-enabled a long-disabled test in test_winsound. + - Issue #19588: Fixed tests in test_random that were silently skipped most of the time. Patch by Julian Gindi. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: More realistic example for selectors.py.
by guido.van.rossum 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/2a679870d7d2 changeset: 87643:2a679870d7d2 user: Guido van Rossum <guido(a)python.org> date: Fri Nov 29 14:51:18 2013 -0800 summary: More realistic example for selectors.py. files: Doc/library/selectors.rst | 65 ++++++++++++++------------ 1 files changed, 36 insertions(+), 29 deletions(-) diff --git a/Doc/library/selectors.rst b/Doc/library/selectors.rst --- a/Doc/library/selectors.rst +++ b/Doc/library/selectors.rst @@ -210,33 +210,40 @@ :func:`select.kqueue` object. -Examples of selector usage:: +Examples +-------- - >>> import selectors - >>> import socket - >>> - >>> s = selectors.DefaultSelector() - >>> r, w = socket.socketpair() - >>> - >>> r.setblocking(False) - >>> w.setblocking(False) - >>> - >>> s.register(r, selectors.EVENT_READ) - SelectorKey(fileobj=<socket.socket fd=4, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=4, events=1, data=None) - >>> s.register(w, selectors.EVENT_WRITE) - SelectorKey(fileobj=<socket.socket fd=5, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=5, events=2, data=None) - >>> - >>> print(s.select()) - [(SelectorKey(fileobj=<socket.socket fd=5, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=5, events=2, data=None), 2)] - >>> - >>> for key, events in s.select(): - ... if events & selectors.EVENT_WRITE: - ... key.fileobj.send(b'spam') - ... - 4 - >>> for key, events in s.select(): - ... if events & selectors.EVENT_READ: - ... print(key.fileobj.recv(1024)) - ... - b'spam' - >>> s.close() +Here is a simple echo server implementation:: + + import selectors + import socket + + sel = selectors.DefaultSelector() + + def accept(sock, mask): + conn, addr = sock.accept() # Should be ready + print('accepted', conn, 'from', addr) + conn.setblocking(False) + sel.register(conn, selectors.EVENT_READ, read) + + def read(conn, mask): + data = conn.recv(1000) # Should be ready + if data: + print('echoing', repr(data), 'to', conn) + conn.send(data) # Hope it won't block + else: + print('closing', conn) + sel.unregister(conn) + conn.close() + + sock = socket.socket() + sock.bind(('localhost', 1234)) + sock.listen(100) + sock.setblocking(False) + sel.register(sock, selectors.EVENT_READ, accept) + + while True: + events = sel.select() + for key, mask in events: + callback = key.data + callback(key.fileobj, mask) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Null merge
by serhiy.storchaka 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/312137dd7ece changeset: 87642:312137dd7ece parent: 87640:dad74ff75a6b parent: 87641:9d0dc3d7bf01 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Fri Nov 29 23:42:55 2013 +0200 summary: Null merge files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Revert unrelated changes introduced by changeset b2066bc8cab9 (issue #19795).
by serhiy.storchaka 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/9d0dc3d7bf01 changeset: 87641:9d0dc3d7bf01 branch: 3.3 parent: 87634:b2066bc8cab9 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Fri Nov 29 23:40:35 2013 +0200 summary: Revert unrelated changes introduced by changeset b2066bc8cab9 (issue #19795). files: Doc/library/importlib.rst | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -918,18 +918,8 @@ Reliance on this decorator is discouraged when it is possible to set :attr:`__package__` before importing. By setting it beforehand the code for the module is executed with the -<<<<<<< attribute set and thus can be used by global level code during initialization. -======= - The ``cpython-32`` string comes from the current magic tag (see - :func:`get_tag`; if :attr:`sys.implementation.cache_tag` is not defined then - :exc:`NotImplementedError` will be raised). The returned path will end in - ``.pyc`` when ``__debug__`` is ``True`` or ``.pyo`` for an optimized Python - (i.e. ``__debug__`` is ``False``). By passing in ``True`` or ``False`` for - *debug_override* you can override the system's value for ``__debug__`` for - extension selection. ->>>>>>> .. note:: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19712: Port test.test_importlib.import_ tests to use PEP 451
by brett.cannon 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/dad74ff75a6b changeset: 87640:dad74ff75a6b user: Brett Cannon <brett(a)python.org> date: Fri Nov 29 16:17:05 2013 -0500 summary: Issue #19712: Port test.test_importlib.import_ tests to use PEP 451 that don't require changing test.test_importlib.util.mock_modules(). files: Lib/test/test_importlib/import_/test___loader__.py | 22 +++ Lib/test/test_importlib/import_/test_api.py | 60 +++++++-- Lib/test/test_importlib/import_/test_path.py | 2 +- 3 files changed, 68 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_importlib/import_/test___loader__.py b/Lib/test/test_importlib/import_/test___loader__.py --- a/Lib/test/test_importlib/import_/test___loader__.py +++ b/Lib/test/test_importlib/import_/test___loader__.py @@ -1,3 +1,4 @@ +from importlib import machinery import sys import types import unittest @@ -6,6 +7,27 @@ from . import util as import_util +class SpecLoaderMock: + + def find_spec(self, fullname, path=None, target=None): + return machinery.ModuleSpec(fullname, self) + + def exec_module(self, module): + pass + + +class SpecLoaderAttributeTests: + + def test___loader__(self): + loader = SpecLoaderMock() + with util.uncache('blah'), util.import_state(meta_path=[loader]): + module = self.__import__('blah') + self.assertEqual(loader, module.__loader__) + +Frozen_SpecTests, Source_SpecTests = util.test_both( + SpecLoaderAttributeTests, __import__=import_util.__import__) + + class LoaderMock: def find_module(self, fullname, path=None): diff --git a/Lib/test/test_importlib/import_/test_api.py b/Lib/test/test_importlib/import_/test_api.py --- a/Lib/test/test_importlib/import_/test_api.py +++ b/Lib/test/test_importlib/import_/test_api.py @@ -1,19 +1,37 @@ from .. import util from . import util as import_util + +from importlib import machinery import sys import types import unittest +PKG_NAME = 'fine' +SUBMOD_NAME = 'fine.bogus' + + +class BadSpecFinderLoader: + @classmethod + def find_spec(cls, fullname, path=None, target=None): + if fullname == SUBMOD_NAME: + spec = machinery.ModuleSpec(fullname, cls) + return spec + + @staticmethod + def exec_module(module): + if module.__name__ == SUBMOD_NAME: + raise ImportError('I cannot be loaded!') + class BadLoaderFinder: - bad = 'fine.bogus' @classmethod def find_module(cls, fullname, path): - if fullname == cls.bad: + if fullname == SUBMOD_NAME: return cls + @classmethod def load_module(cls, fullname): - if fullname == cls.bad: + if fullname == SUBMOD_NAME: raise ImportError('I cannot be loaded!') @@ -37,27 +55,39 @@ def test_nonexistent_fromlist_entry(self): # If something in fromlist doesn't exist, that's okay. # issue15715 - mod = types.ModuleType('fine') + mod = types.ModuleType(PKG_NAME) mod.__path__ = ['XXX'] - with util.import_state(meta_path=[BadLoaderFinder]): - with util.uncache('fine'): - sys.modules['fine'] = mod - self.__import__('fine', fromlist=['not here']) + with util.import_state(meta_path=[self.bad_finder_loader]): + with util.uncache(PKG_NAME): + sys.modules[PKG_NAME] = mod + self.__import__(PKG_NAME, fromlist=['not here']) def test_fromlist_load_error_propagates(self): # If something in fromlist triggers an exception not related to not # existing, let that exception propagate. # issue15316 - mod = types.ModuleType('fine') + mod = types.ModuleType(PKG_NAME) mod.__path__ = ['XXX'] - with util.import_state(meta_path=[BadLoaderFinder]): - with util.uncache('fine'): - sys.modules['fine'] = mod + with util.import_state(meta_path=[self.bad_finder_loader]): + with util.uncache(PKG_NAME): + sys.modules[PKG_NAME] = mod with self.assertRaises(ImportError): - self.__import__('fine', fromlist=['bogus']) + self.__import__(PKG_NAME, + fromlist=[SUBMOD_NAME.rpartition('.')[-1]]) -Frozen_APITests, Source_APITests = util.test_both( - APITest, __import__=import_util.__import__) + +class OldAPITests(APITest): + bad_finder_loader = BadLoaderFinder + +Frozen_OldAPITests, Source_OldAPITests = util.test_both( + OldAPITests, __import__=import_util.__import__) + + +class SpecAPITests(APITest): + bad_finder_loader = BadSpecFinderLoader + +Frozen_SpecAPITests, Source_SpecAPITests = util.test_both( + SpecAPITests, __import__=import_util.__import__) if __name__ == '__main__': diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py --- a/Lib/test/test_importlib/import_/test_path.py +++ b/Lib/test/test_importlib/import_/test_path.py @@ -17,7 +17,7 @@ """Tests for PathFinder.""" def test_failure(self): - # Test None returned upon not finding a suitable finder. + # Test None returned upon not finding a suitable loader. module = '<test module>' with util.import_state(): self.assertIsNone(self.machinery.PathFinder.find_module(module)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Remove trailing blanks.
by charles-francois.natali 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/a1a936a3b2f6 changeset: 87639:a1a936a3b2f6 user: Charles-François Natali <cf.natali(a)gmail.com> date: Fri Nov 29 18:57:47 2013 +0100 summary: Remove trailing blanks. files: Doc/library/selectors.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/selectors.rst b/Doc/library/selectors.rst --- a/Doc/library/selectors.rst +++ b/Doc/library/selectors.rst @@ -214,29 +214,29 @@ >>> import selectors >>> import socket - >>> + >>> >>> s = selectors.DefaultSelector() >>> r, w = socket.socketpair() - >>> + >>> >>> r.setblocking(False) >>> w.setblocking(False) - >>> + >>> >>> s.register(r, selectors.EVENT_READ) SelectorKey(fileobj=<socket.socket fd=4, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=4, events=1, data=None) >>> s.register(w, selectors.EVENT_WRITE) SelectorKey(fileobj=<socket.socket fd=5, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=5, events=2, data=None) - >>> + >>> >>> print(s.select()) [(SelectorKey(fileobj=<socket.socket fd=5, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=5, events=2, data=None), 2)] - >>> + >>> >>> for key, events in s.select(): ... if events & selectors.EVENT_WRITE: ... key.fileobj.send(b'spam') - ... + ... 4 >>> for key, events in s.select(): ... if events & selectors.EVENT_READ: ... print(key.fileobj.recv(1024)) - ... + ... b'spam' >>> s.close() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Set the FDs non-blocking in the selectors example.
by charles-francois.natali 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/07e4b1a4c36d changeset: 87638:07e4b1a4c36d user: Charles-François Natali <cf.natali(a)gmail.com> date: Fri Nov 29 18:52:51 2013 +0100 summary: Set the FDs non-blocking in the selectors example. files: Doc/library/selectors.rst | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Doc/library/selectors.rst b/Doc/library/selectors.rst --- a/Doc/library/selectors.rst +++ b/Doc/library/selectors.rst @@ -214,26 +214,29 @@ >>> import selectors >>> import socket - >>> + >>> >>> s = selectors.DefaultSelector() >>> r, w = socket.socketpair() - >>> + >>> + >>> r.setblocking(False) + >>> w.setblocking(False) + >>> >>> s.register(r, selectors.EVENT_READ) - SelectorKey(fileobj=<socket.socket fd=4, family=1, type=1, proto=0>, fd=4, events=1, data=None) + SelectorKey(fileobj=<socket.socket fd=4, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=4, events=1, data=None) >>> s.register(w, selectors.EVENT_WRITE) - SelectorKey(fileobj=<socket.socket fd=5, family=1, type=1, proto=0>, fd=5, events=2, data=None) - >>> + SelectorKey(fileobj=<socket.socket fd=5, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=5, events=2, data=None) + >>> >>> print(s.select()) - [(SelectorKey(fileobj=<socket.socket fd=5, family=1, type=1, proto=0>, fd=5, events=2, data=None), 2)] - >>> + [(SelectorKey(fileobj=<socket.socket fd=5, family=AddressFamily.AF_UNIX, type=2049, proto=0>, fd=5, events=2, data=None), 2)] + >>> >>> for key, events in s.select(): ... if events & selectors.EVENT_WRITE: ... key.fileobj.send(b'spam') - ... + ... 4 >>> for key, events in s.select(): ... if events & selectors.EVENT_READ: ... print(key.fileobj.recv(1024)) - ... + ... b'spam' >>> s.close() -- Repository URL: http://hg.python.org/cpython

1 0

devinabox: Make running build_cpython.py even easier by using more heuristics to guess
by brett.cannon 29 Nov '13

29 Nov '13

http://hg.python.org/devinabox/rev/32c1302a9242 changeset: 59:32c1302a9242 user: Brett Cannon <brett(a)python.org> date: Fri Nov 29 15:06:28 2013 -0500 summary: Make running build_cpython.py even easier by using more heuristics to guess where the CPython checkout is. files: build_cpython.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/build_cpython.py b/build_cpython.py --- a/build_cpython.py +++ b/build_cpython.py @@ -58,7 +58,13 @@ if arg_count > 1: raise ValueError( '0 or 1 arguments expected, not {}'.format(arg_count)) - executable = main(sys.argv[1] if arg_count else 'cpython') + elif arg_count == 1: + directory = sys.argv[1] + elif os.path.exists('cpython'): + directory = 'cpython' + else: + directory = '.' + executable = main(directory) if not executable: print('CPython executable NOT found') else: -- Repository URL: http://hg.python.org/devinabox

1 0

peps: Add instructions for HTM generation.
by guido.van.rossum 29 Nov '13

29 Nov '13

http://hg.python.org/peps/rev/ee8a6ec1de74 changeset: 5326:ee8a6ec1de74 user: Guido van Rossum <guido(a)dropbox.com> date: Fri Nov 29 10:34:39 2013 -0800 summary: Add instructions for HTM generation. files: README.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -21,3 +21,14 @@ For processing reStructuredText format PEPs, you need the docutils package, which is available from PyPI (http://pypi.python.org). If you have pip, "pip install docutils" should install it. + + +Generating HTML +=============== + +Do not commit changes with bad formatting. To check the formatting of +a PEP, use the Makefile. In particular, to generate HTML for PEP 999, +your source code should be in pep-0999.txt and the HTML will be +generated to pep-0999.html by the command "make pep-0999.html". The +default Make target generates HTML for all PEPs. If you don't have +Make, use the pep2html.py script. -- Repository URL: http://hg.python.org/peps

1 0