Mailman 3 November 2014 - Python-checkins

cpython (2.7): use pythontest.net for url fragment test
by benjamin.peterson 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/603bd221527c changeset: 93391:603bd221527c branch: 2.7 parent: 93385:4c260cf1ba39 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 05 11:27:14 2014 -0500 summary: use pythontest.net for url fragment test files: Lib/test/test_urllib2net.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -155,12 +155,12 @@ ## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) def test_urlwithfrag(self): - urlwith_frag = "https://docs.python.org/2/glossary.html#glossary" + urlwith_frag = "http://www.pythontest.net/index.html#frag" with test_support.transient_internet(urlwith_frag): req = urllib2.Request(urlwith_frag) res = urllib2.urlopen(req) self.assertEqual(res.geturl(), - "https://docs.python.org/2/glossary.html#glossary") + "http://www.pythontest.net/index.html#frag") def test_fileno(self): req = urllib2.Request("http://www.example.com") -- Repository URL: https://hg.python.org/cpython

1 0

pythontestdotnet: fix wording
by benjamin.peterson 05 Nov '14

05 Nov '14

https://hg.python.org/pythontestdotnet/rev/92f2abd2f88b changeset: 2:92f2abd2f88b user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 05 11:12:18 2014 -0500 summary: fix wording files: www/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/www/index.html b/www/index.html --- a/www/index.html +++ b/www/index.html @@ -4,7 +4,7 @@ <title>(C)Python test resources</title> </head> <body> - This domain is hosted to host various services contacted by + This domain is used to host various services contacted by the <a href="https://www.python.org">Python</a> test suite. </body> </html> -- Repository URL: https://hg.python.org/pythontestdotnet

1 0

pythontestdotnet: add index page
by benjamin.peterson 05 Nov '14

05 Nov '14

https://hg.python.org/pythontestdotnet/rev/607a33b35ad4 changeset: 1:607a33b35ad4 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 05 11:08:16 2014 -0500 summary: add index page files: www/index.html | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/www/index.html b/www/index.html new file mode 100644 --- /dev/null +++ b/www/index.html @@ -0,0 +1,10 @@ +<!doctype html> +<html> + <head> + <title>(C)Python test resources</title> + </head> + <body> + This domain is hosted to host various services contacted by + the <a href="https://www.python.org">Python</a> test suite. + </body> +</html> -- Repository URL: https://hg.python.org/pythontestdotnet

1 0

cpython: Issue #22793, #22637: Add missing "import os" in uuid._ifconfig_getnode()
by victor.stinner 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/16d6c2443131 changeset: 93390:16d6c2443131 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 05 16:55:36 2014 +0100 summary: Issue #22793, #22637: Add missing "import os" in uuid._ifconfig_getnode() files: Lib/uuid.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -346,6 +346,7 @@ def _ifconfig_getnode(): """Get the hardware address on Unix by running ifconfig.""" + import os # This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes. for args in ('', '-a', '-av'): -- Repository URL: https://hg.python.org/cpython

1 0

pythontestdotnet: add self-signed cert and key
by benjamin.peterson 05 Nov '14

05 Nov '14

https://hg.python.org/pythontestdotnet/rev/075864c8191e changeset: 0:075864c8191e user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 05 10:19:31 2014 -0500 summary: add self-signed cert and key files: tls/self-signed-cert.pem | 16 ++++++++++++++++ tls/self-signed-key.pem | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/tls/self-signed-cert.pem b/tls/self-signed-cert.pem new file mode 100644 --- /dev/null +++ b/tls/self-signed-cert.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIIChzCCAfCgAwIBAgIJAKGU95wKR8pSMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV +BAYTAlhZMRcwFQYDVQQHDA5DYXN0bGUgQW50aHJheDEjMCEGA1UECgwaUHl0aG9u +IFNvZnR3YXJlIEZvdW5kYXRpb24xIzAhBgNVBAMMGnNlbGYtc2lnbmVkLnB5dGhv +bnRlc3QubmV0MB4XDTE0MTEwMjE4MDkyOVoXDTI0MTAzMDE4MDkyOVowcDELMAkG +A1UEBhMCWFkxFzAVBgNVBAcMDkNhc3RsZSBBbnRocmF4MSMwIQYDVQQKDBpQeXRo +b24gU29mdHdhcmUgRm91bmRhdGlvbjEjMCEGA1UEAwwac2VsZi1zaWduZWQucHl0 +aG9udGVzdC5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANDXQXW9tjyZ +Xt0Iv2tLL1+jinr4wGg36ioLDLFkMf+2Y1GL0v0BnKYG4N1OKlAU15LXGeGer8vm +Sv/yIvmdrELvhAbbo3w4a9TMYQA4XkIVLdvu3mvNOAet+8PMJxn26dbDhG809ALv +EHY57lQsBS3G59RZyBPVqAqmImWNJnVzAgMBAAGjKTAnMCUGA1UdEQQeMByCGnNl +bGYtc2lnbmVkLnB5dGhvbnRlc3QubmV0MA0GCSqGSIb3DQEBBQUAA4GBAIOXmdtM +eG9qzP9TiXW/Gc/zI4cBfdCpC+Y4gOfC9bQUC7hefix4iO3+iZjgy3X/FaRxUUoV +HKiXcXIaWqTSUWp45cSh0MbwZXudp6JIAptzdAhvvCrPKeC9i9GvxsPD4LtDAL97 +vSaxQBezA7hdxZd90/EeyMgVZgAnTCnvAWX9 +-----END CERTIFICATE----- diff --git a/tls/self-signed-key.pem b/tls/self-signed-key.pem new file mode 100644 --- /dev/null +++ b/tls/self-signed-key.pem @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANDXQXW9tjyZXt0I +v2tLL1+jinr4wGg36ioLDLFkMf+2Y1GL0v0BnKYG4N1OKlAU15LXGeGer8vmSv/y +IvmdrELvhAbbo3w4a9TMYQA4XkIVLdvu3mvNOAet+8PMJxn26dbDhG809ALvEHY5 +7lQsBS3G59RZyBPVqAqmImWNJnVzAgMBAAECgYEArO8iwJn5FxM1r7j3saRPtVWa +bZwgz+xFVs1RlG9Qy9w/QB6V93ZnPkCB4iBA/5FStcCzKNab4i9wOaNLfQIoysDZ +jOonRG6pbdFSIBnH4lw1UGi8SS34gFhvWuDW6QHya1enMu2eyOz0W756FUIy9uLx +V1//jNjeT7UcsFowgkkCQQD4ZlMnCWwygGKO3KXlHp0X44UL3HjIObBhaoBECkci +kxsbk8Iwarcq5BBKgwKtTaGvcnzlM9N5xTZ7v30nukANAkEA1zsSmB0P9k5pZsAs +xqRQggVdnjZ55zI6q6KrP69f9LJy8bEQ2Xz1MluAUwKsG26gsThzMPBdn2rWmjYf +9NirfwJAXhWr0zJfd/Vm30O11kW1LNIxl5+HZBdttkg3kw3tiav8bYKW3+3buPQv +M3nR7sBjyGdt5QavSAUpsM+D4SNLlQJAJ4flCWVFGkMantGrJ6zkUI01vapZx3n1 +RrLw6xiF8kaYUAXqh1epHV+q+RQjkkJGZ2Zr2dA8Edyon9hTFEB7dwJBAPRRChg8 +9fcihtNMiRwzGGr7rHtS1TpoA5hbIjPCbY8rHMkLdMnoxBa11E9PmXqyyyctrN+z +o54iWWshXKtbx24= +-----END PRIVATE KEY----- -- Repository URL: https://hg.python.org/pythontestdotnet

1 0

cpython (3.4): asyncio: Move loop attribute to _FlowControlMixin
by victor.stinner 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/d05ba48cfc29 changeset: 93388:d05ba48cfc29 branch: 3.4 parent: 93380:c4b5a5d44254 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 05 15:27:41 2014 +0100 summary: asyncio: Move loop attribute to _FlowControlMixin Move the _loop attribute from the constructor of _SelectorTransport, _ProactorBasePipeTransport and _UnixWritePipeTransport classes to the constructor of the _FlowControlMixin class. Add also an assertion to explicit that the parent class must ensure that the loop is defined (not None) files: Lib/asyncio/proactor_events.py | 3 +-- Lib/asyncio/selector_events.py | 3 +-- Lib/asyncio/transports.py | 4 +++- Lib/asyncio/unix_events.py | 3 +-- Lib/test/test_asyncio/test_transports.py | 3 ++- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -21,9 +21,8 @@ def __init__(self, loop, sock, protocol, waiter=None, extra=None, server=None): - super().__init__(extra) + super().__init__(extra, loop) self._set_extra(sock) - self._loop = loop self._sock = sock self._protocol = protocol self._server = server diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -447,7 +447,7 @@ _buffer_factory = bytearray # Constructs initial value for self._buffer. def __init__(self, loop, sock, protocol, extra, server=None): - super().__init__(extra) + super().__init__(extra, loop) self._extra['socket'] = sock self._extra['sockname'] = sock.getsockname() if 'peername' not in self._extra: @@ -455,7 +455,6 @@ self._extra['peername'] = sock.getpeername() except socket.error: self._extra['peername'] = None - self._loop = loop self._sock = sock self._sock_fd = sock.fileno() self._protocol = protocol diff --git a/Lib/asyncio/transports.py b/Lib/asyncio/transports.py --- a/Lib/asyncio/transports.py +++ b/Lib/asyncio/transports.py @@ -238,8 +238,10 @@ resume_writing() may be called. """ - def __init__(self, extra=None): + def __init__(self, extra=None, loop=None): super().__init__(extra) + assert loop is not None + self._loop = loop self._protocol_paused = False self._set_write_buffer_limits() diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -369,9 +369,8 @@ transports.WriteTransport): def __init__(self, loop, pipe, protocol, waiter=None, extra=None): - super().__init__(extra) + super().__init__(extra, loop) self._extra['pipe'] = pipe - self._loop = loop self._pipe = pipe self._fileno = pipe.fileno() mode = os.fstat(self._fileno).st_mode diff --git a/Lib/test/test_asyncio/test_transports.py b/Lib/test/test_asyncio/test_transports.py --- a/Lib/test/test_asyncio/test_transports.py +++ b/Lib/test/test_asyncio/test_transports.py @@ -69,7 +69,8 @@ def get_write_buffer_size(self): return 512 - transport = MyTransport() + loop = mock.Mock() + transport = MyTransport(loop=loop) transport._protocol = mock.Mock() self.assertFalse(transport._protocol_paused) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) asyncio: Move loop attribute to _FlowControlMixin
by victor.stinner 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/b9ee2082256d changeset: 93389:b9ee2082256d parent: 93387:d6fb87972dee parent: 93388:d05ba48cfc29 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 05 15:27:54 2014 +0100 summary: (Merge 3.4) asyncio: Move loop attribute to _FlowControlMixin Move the _loop attribute from the constructor of _SelectorTransport, _ProactorBasePipeTransport and _UnixWritePipeTransport classes to the constructor of the _FlowControlMixin class. Add also an assertion to explicit that the parent class must ensure that the loop is defined (not None) files: Lib/asyncio/proactor_events.py | 3 +-- Lib/asyncio/selector_events.py | 3 +-- Lib/asyncio/transports.py | 4 +++- Lib/asyncio/unix_events.py | 3 +-- Lib/test/test_asyncio/test_transports.py | 3 ++- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -21,9 +21,8 @@ def __init__(self, loop, sock, protocol, waiter=None, extra=None, server=None): - super().__init__(extra) + super().__init__(extra, loop) self._set_extra(sock) - self._loop = loop self._sock = sock self._protocol = protocol self._server = server diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -447,7 +447,7 @@ _buffer_factory = bytearray # Constructs initial value for self._buffer. def __init__(self, loop, sock, protocol, extra, server=None): - super().__init__(extra) + super().__init__(extra, loop) self._extra['socket'] = sock self._extra['sockname'] = sock.getsockname() if 'peername' not in self._extra: @@ -455,7 +455,6 @@ self._extra['peername'] = sock.getpeername() except socket.error: self._extra['peername'] = None - self._loop = loop self._sock = sock self._sock_fd = sock.fileno() self._protocol = protocol diff --git a/Lib/asyncio/transports.py b/Lib/asyncio/transports.py --- a/Lib/asyncio/transports.py +++ b/Lib/asyncio/transports.py @@ -238,8 +238,10 @@ resume_writing() may be called. """ - def __init__(self, extra=None): + def __init__(self, extra=None, loop=None): super().__init__(extra) + assert loop is not None + self._loop = loop self._protocol_paused = False self._set_write_buffer_limits() diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -369,9 +369,8 @@ transports.WriteTransport): def __init__(self, loop, pipe, protocol, waiter=None, extra=None): - super().__init__(extra) + super().__init__(extra, loop) self._extra['pipe'] = pipe - self._loop = loop self._pipe = pipe self._fileno = pipe.fileno() mode = os.fstat(self._fileno).st_mode diff --git a/Lib/test/test_asyncio/test_transports.py b/Lib/test/test_asyncio/test_transports.py --- a/Lib/test/test_asyncio/test_transports.py +++ b/Lib/test/test_asyncio/test_transports.py @@ -69,7 +69,8 @@ def get_write_buffer_size(self): return 512 - transport = MyTransport() + loop = mock.Mock() + transport = MyTransport(loop=loop) transport._protocol = mock.Mock() self.assertFalse(transport._protocol_paused) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #20597, #21274: Remove unused definition of PATH_MAX on GNU/Hurd,
by victor.stinner 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/d6fb87972dee changeset: 93387:d6fb87972dee user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 05 15:13:51 2014 +0100 summary: Issue #20597, #21274: Remove unused definition of PATH_MAX on GNU/Hurd, MAXPATHLEN is now preferred. files: Python/pythonrun.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -34,10 +34,6 @@ #include "windows.h" #endif -#ifdef __gnu_hurd__ -#define PATH_MAX MAXPATHLEN -#endif - _Py_IDENTIFIER(builtins); _Py_IDENTIFIER(excepthook); _Py_IDENTIFIER(flush); -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #20597: Remove unused definition of PATH_MAX on Windows, MAXPATHLEN is
by victor.stinner 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/6aaa0aab1e93 changeset: 93386:6aaa0aab1e93 parent: 93384:2aac2d76035e user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 05 15:11:34 2014 +0100 summary: Issue #20597: Remove unused definition of PATH_MAX on Windows, MAXPATHLEN is now preferred. Patch written by Jeffrey Armstrong. files: Modules/main.c | 1 - Python/pythonrun.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Modules/main.c b/Modules/main.c --- a/Modules/main.c +++ b/Modules/main.c @@ -9,7 +9,6 @@ #include <windows.h> #ifdef HAVE_FCNTL_H #include <fcntl.h> -#define PATH_MAX MAXPATHLEN #endif #endif diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -32,7 +32,6 @@ #ifdef MS_WINDOWS #undef BYTE #include "windows.h" -#define PATH_MAX MAXPATHLEN #endif #ifdef __gnu_hurd__ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #19753: Fix test_gdb on SystemZ buildbot, ignore warnings
by victor.stinner 05 Nov '14

05 Nov '14

https://hg.python.org/cpython/rev/4c260cf1ba39 changeset: 93385:4c260cf1ba39 branch: 2.7 parent: 93382:eba6e68e818c user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 05 15:07:18 2014 +0100 summary: Issue #19753: Fix test_gdb on SystemZ buildbot, ignore warnings files: Lib/test/test_gdb.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -163,6 +163,10 @@ 'linux-gate.so', 'Do you need "set solib-search-path" or ' '"set sysroot"?', + 'warning: Source file is more recent than executable.', + # Issue #19753: missing symbols on System Z + 'Missing separate debuginfo for ', + 'Try: zypper install -C ', ) for line in errlines: if not line.startswith(ignore_patterns): -- Repository URL: https://hg.python.org/cpython

1 0