Mailman 3 September 2009 - Python-checkins

r75063 - in python/branches/release31-maint: Lib/lib2to3/main.py Tools/scripts/pathfix.py
by benjamin.peterson 25 Sep '09

25 Sep '09

Author: benjamin.peterson Date: Fri Sep 25 23:13:17 2009 New Revision: 75063 Log: Merged revisions 75061-75062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75061 | benjamin.peterson | 2009-09-25 15:34:04 -0500 (Fri, 25 Sep 2009) | 1 line fix print statement ........ r75062 | benjamin.peterson | 2009-09-25 15:56:52 -0500 (Fri, 25 Sep 2009) | 2 lines correct the fixpath.py script to work in Python 3 #6999 ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/lib2to3/main.py python/branches/release31-maint/Tools/scripts/pathfix.py Modified: python/branches/release31-maint/Lib/lib2to3/main.py ============================================================================== --- python/branches/release31-maint/Lib/lib2to3/main.py (original) +++ python/branches/release31-maint/Lib/lib2to3/main.py Fri Sep 25 23:13:17 2009 @@ -64,7 +64,7 @@ print(line) def warn(msg): - print >> sys.stderr, "WARNING: %s" % (msg,) + print("WARNING: %s" % (msg,), file=sys.stderr) def main(fixer_pkg, args=None): @@ -159,8 +159,8 @@ options.processes) except refactor.MultiprocessingUnsupported: assert options.processes > 1 - print >> sys.stderr, "Sorry, -j isn't " \ - "supported on this platform." + print("Sorry, -j isn't supported on this platform.", + file=sys.stderr) return 1 rt.summarize() Modified: python/branches/release31-maint/Tools/scripts/pathfix.py ============================================================================== --- python/branches/release31-maint/Tools/scripts/pathfix.py (original) +++ python/branches/release31-maint/Tools/scripts/pathfix.py Fri Sep 25 23:13:17 2009 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 # Change the #! line occurring in Python scripts. The new interpreter # pathname must be given with a -i option. @@ -43,8 +43,9 @@ sys.exit(2) for o, a in opts: if o == '-i': - new_interpreter = a - if not new_interpreter or new_interpreter[0] != '/' or not args: + new_interpreter = a.encode() + if not new_interpreter or not new_interpreter.startswith(b'/') or \ + not args: err('-i option or file-or-directory missing\n') err(usage) sys.exit(2) @@ -61,7 +62,7 @@ ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$') def ispython(name): - return ispythonprog.match(name) >= 0 + return bool(ispythonprog.match(name)) def recursedown(dirname): dbg('recursedown(%r)\n' % (dirname,)) @@ -88,7 +89,7 @@ def fix(filename): ## dbg('fix(%r)\n' % (filename,)) try: - f = open(filename, 'r') + f = open(filename, 'rb') except IOError as msg: err('%s: cannot open: %r\n' % (filename, msg)) return 1 @@ -101,7 +102,7 @@ head, tail = os.path.split(filename) tempname = os.path.join(head, '@' + tail) try: - g = open(tempname, 'w') + g = open(tempname, 'wb') except IOError as msg: f.close() err('%s: cannot create: %r\n' % (tempname, msg)) @@ -139,11 +140,11 @@ return 0 def fixline(line): - if not line.startswith('#!'): + if not line.startswith(b'#!'): return line - if "python" not in line: + if b"python" not in line: return line - return '#! %s\n' % new_interpreter + return b'#! ' + new_interpreter + b'\n' if __name__ == '__main__': main()

1 0

r75062 - python/branches/py3k/Tools/scripts/pathfix.py
by benjamin.peterson 25 Sep '09

25 Sep '09

Author: benjamin.peterson Date: Fri Sep 25 22:56:52 2009 New Revision: 75062 Log: correct the fixpath.py script to work in Python 3 #6999 Modified: python/branches/py3k/Tools/scripts/pathfix.py Modified: python/branches/py3k/Tools/scripts/pathfix.py ============================================================================== --- python/branches/py3k/Tools/scripts/pathfix.py (original) +++ python/branches/py3k/Tools/scripts/pathfix.py Fri Sep 25 22:56:52 2009 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 # Change the #! line occurring in Python scripts. The new interpreter # pathname must be given with a -i option. @@ -43,8 +43,9 @@ sys.exit(2) for o, a in opts: if o == '-i': - new_interpreter = a - if not new_interpreter or new_interpreter[0] != '/' or not args: + new_interpreter = a.encode() + if not new_interpreter or not new_interpreter.startswith(b'/') or \ + not args: err('-i option or file-or-directory missing\n') err(usage) sys.exit(2) @@ -61,7 +62,7 @@ ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$') def ispython(name): - return ispythonprog.match(name) >= 0 + return bool(ispythonprog.match(name)) def recursedown(dirname): dbg('recursedown(%r)\n' % (dirname,)) @@ -88,7 +89,7 @@ def fix(filename): ## dbg('fix(%r)\n' % (filename,)) try: - f = open(filename, 'r') + f = open(filename, 'rb') except IOError as msg: err('%s: cannot open: %r\n' % (filename, msg)) return 1 @@ -101,7 +102,7 @@ head, tail = os.path.split(filename) tempname = os.path.join(head, '@' + tail) try: - g = open(tempname, 'w') + g = open(tempname, 'wb') except IOError as msg: f.close() err('%s: cannot create: %r\n' % (tempname, msg)) @@ -139,11 +140,11 @@ return 0 def fixline(line): - if not line.startswith('#!'): + if not line.startswith(b'#!'): return line - if "python" not in line: + if b"python" not in line: return line - return '#! %s\n' % new_interpreter + return b'#! ' + new_interpreter + b'\n' if __name__ == '__main__': main()

1 0

r75061 - python/branches/py3k/Lib/lib2to3/main.py
by benjamin.peterson 25 Sep '09

25 Sep '09

Author: benjamin.peterson Date: Fri Sep 25 22:34:04 2009 New Revision: 75061 Log: fix print statement Modified: python/branches/py3k/Lib/lib2to3/main.py Modified: python/branches/py3k/Lib/lib2to3/main.py ============================================================================== --- python/branches/py3k/Lib/lib2to3/main.py (original) +++ python/branches/py3k/Lib/lib2to3/main.py Fri Sep 25 22:34:04 2009 @@ -64,7 +64,7 @@ print(line) def warn(msg): - print >> sys.stderr, "WARNING: %s" % (msg,) + print("WARNING: %s" % (msg,), file=sys.stderr) def main(fixer_pkg, args=None): @@ -159,8 +159,8 @@ options.processes) except refactor.MultiprocessingUnsupported: assert options.processes > 1 - print >> sys.stderr, "Sorry, -j isn't " \ - "supported on this platform." + print("Sorry, -j isn't supported on this platform.", + file=sys.stderr) return 1 rt.summarize()

1 0

r75060 - in python/branches/release31-maint: Doc/tutorial/introduction.rst
by ezio.melotti 25 Sep '09

25 Sep '09

Author: ezio.melotti Date: Fri Sep 25 22:15:31 2009 New Revision: 75060 Log: Merged revisions 75059 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75059 | ezio.melotti | 2009-09-25 23:14:02 +0300 (Fri, 25 Sep 2009) | 1 line #6998: fix missing () on a print ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/tutorial/introduction.rst Modified: python/branches/release31-maint/Doc/tutorial/introduction.rst ============================================================================== --- python/branches/release31-maint/Doc/tutorial/introduction.rst (original) +++ python/branches/release31-maint/Doc/tutorial/introduction.rst Fri Sep 25 22:15:31 2009 @@ -222,11 +222,11 @@ ``'''``. End of lines do not need to be escaped when using triple-quotes, but they will be included in the string. :: - print """ + print(""" Usage: thingy [OPTIONS] -h Display this usage message -H hostname Hostname to connect to - """ + """) produces the following output:

1 0

r75059 - python/branches/py3k/Doc/tutorial/introduction.rst
by ezio.melotti 25 Sep '09

25 Sep '09

Author: ezio.melotti Date: Fri Sep 25 22:14:02 2009 New Revision: 75059 Log: #6998: fix missing () on a print Modified: python/branches/py3k/Doc/tutorial/introduction.rst Modified: python/branches/py3k/Doc/tutorial/introduction.rst ============================================================================== --- python/branches/py3k/Doc/tutorial/introduction.rst (original) +++ python/branches/py3k/Doc/tutorial/introduction.rst Fri Sep 25 22:14:02 2009 @@ -222,11 +222,11 @@ ``'''``. End of lines do not need to be escaped when using triple-quotes, but they will be included in the string. :: - print """ + print(""" Usage: thingy [OPTIONS] -h Display this usage message -H hostname Hostname to connect to - """ + """) produces the following output:

1 0

r75058 - in python/branches/release31-maint: Objects/enumobject.c
by ezio.melotti 25 Sep '09

25 Sep '09

Author: ezio.melotti Date: Fri Sep 25 18:14:31 2009 New Revision: 75058 Log: Merged revisions 75057 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75057 | ezio.melotti | 2009-09-25 19:12:33 +0300 (Fri, 25 Sep 2009) | 9 lines Merged revisions 75055 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75055 | ezio.melotti | 2009-09-25 19:07:55 +0300 (Fri, 25 Sep 2009) | 1 line #6994: fix typo in enumerate docstring ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Objects/enumobject.c Modified: python/branches/release31-maint/Objects/enumobject.c ============================================================================== --- python/branches/release31-maint/Objects/enumobject.c (original) +++ python/branches/release31-maint/Objects/enumobject.c Fri Sep 25 18:14:31 2009 @@ -161,7 +161,7 @@ PyDoc_STRVAR(enum_doc, "enumerate(iterable) -> iterator for index, value of iterable\n" "\n" -"Return an enumerate object. iterable must be an other object that supports\n" +"Return an enumerate object. iterable must be another object that supports\n" "iteration. The enumerate object yields pairs containing a count (from\n" "zero) and a value yielded by the iterable argument. enumerate is useful\n" "for obtaining an indexed list: (0, seq[0]), (1, seq[1]), (2, seq[2]), ...");

1 0

r75057 - in python/branches/py3k: Objects/enumobject.c
by ezio.melotti 25 Sep '09

25 Sep '09

Author: ezio.melotti Date: Fri Sep 25 18:12:33 2009 New Revision: 75057 Log: Merged revisions 75055 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75055 | ezio.melotti | 2009-09-25 19:07:55 +0300 (Fri, 25 Sep 2009) | 1 line #6994: fix typo in enumerate docstring ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Objects/enumobject.c Modified: python/branches/py3k/Objects/enumobject.c ============================================================================== --- python/branches/py3k/Objects/enumobject.c (original) +++ python/branches/py3k/Objects/enumobject.c Fri Sep 25 18:12:33 2009 @@ -161,7 +161,7 @@ PyDoc_STRVAR(enum_doc, "enumerate(iterable) -> iterator for index, value of iterable\n" "\n" -"Return an enumerate object. iterable must be an other object that supports\n" +"Return an enumerate object. iterable must be another object that supports\n" "iteration. The enumerate object yields pairs containing a count (from\n" "zero) and a value yielded by the iterable argument. enumerate is useful\n" "for obtaining an indexed list: (0, seq[0]), (1, seq[1]), (2, seq[2]), ...");

1 0

r75056 - in python/branches/release26-maint: Objects/enumobject.c
by ezio.melotti 25 Sep '09

25 Sep '09

Author: ezio.melotti Date: Fri Sep 25 18:10:55 2009 New Revision: 75056 Log: Merged revisions 75055 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75055 | ezio.melotti | 2009-09-25 19:07:55 +0300 (Fri, 25 Sep 2009) | 1 line #6994: fix typo in enumerate docstring ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Objects/enumobject.c Modified: python/branches/release26-maint/Objects/enumobject.c ============================================================================== --- python/branches/release26-maint/Objects/enumobject.c (original) +++ python/branches/release26-maint/Objects/enumobject.c Fri Sep 25 18:10:55 2009 @@ -161,7 +161,7 @@ PyDoc_STRVAR(enum_doc, "enumerate(iterable) -> iterator for index, value of iterable\n" "\n" -"Return an enumerate object. iterable must be an other object that supports\n" +"Return an enumerate object. iterable must be another object that supports\n" "iteration. The enumerate object yields pairs containing a count (from\n" "zero) and a value yielded by the iterable argument. enumerate is useful\n" "for obtaining an indexed list: (0, seq[0]), (1, seq[1]), (2, seq[2]), ...");

1 0

r75055 - python/trunk/Objects/enumobject.c
by ezio.melotti 25 Sep '09

25 Sep '09

Author: ezio.melotti Date: Fri Sep 25 18:07:55 2009 New Revision: 75055 Log: #6994: fix typo in enumerate docstring Modified: python/trunk/Objects/enumobject.c Modified: python/trunk/Objects/enumobject.c ============================================================================== --- python/trunk/Objects/enumobject.c (original) +++ python/trunk/Objects/enumobject.c Fri Sep 25 18:07:55 2009 @@ -161,7 +161,7 @@ PyDoc_STRVAR(enum_doc, "enumerate(iterable) -> iterator for index, value of iterable\n" "\n" -"Return an enumerate object. iterable must be an other object that supports\n" +"Return an enumerate object. iterable must be another object that supports\n" "iteration. The enumerate object yields pairs containing a count (from\n" "zero) and a value yielded by the iterable argument. enumerate is useful\n" "for obtaining an indexed list: (0, seq[0]), (1, seq[1]), (2, seq[2]), ...");

1 0

r75054 - in python/trunk: Lib/test/test_socket.py Modules/socketmodule.c
by kristjan.jonsson 25 Sep '09

25 Sep '09

Author: kristjan.jonsson Date: Fri Sep 25 17:19:51 2009 New Revision: 75054 Log: http://bugs.python.org/issue6971 Adding the SIO_KEEPALIVE_VALS command to socket.ioctl on windows Modified: python/trunk/Lib/test/test_socket.py python/trunk/Modules/socketmodule.c Modified: python/trunk/Lib/test/test_socket.py ============================================================================== --- python/trunk/Lib/test/test_socket.py (original) +++ python/trunk/Lib/test/test_socket.py Fri Sep 25 17:19:51 2009 @@ -543,6 +543,10 @@ self.assertTrue(hasattr(socket, 'SIO_RCVALL')) self.assertTrue(hasattr(socket, 'RCVALL_ON')) self.assertTrue(hasattr(socket, 'RCVALL_OFF')) + self.assertTrue(hasattr(socket, 'SIO_KEEPALIVE_VALS')) + s = socket.socket() + self.assertRaises(ValueError, s.ioctl, -1, None) + s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100)) class BasicTCPTest(SocketConnectedTest): Modified: python/trunk/Modules/socketmodule.c ============================================================================== --- python/trunk/Modules/socketmodule.c (original) +++ python/trunk/Modules/socketmodule.c Fri Sep 25 17:19:51 2009 @@ -2863,24 +2863,43 @@ sock_ioctl(PySocketSockObject *s, PyObject *arg) { unsigned long cmd = SIO_RCVALL; - unsigned int option = RCVALL_ON; - DWORD recv; + PyObject *argO; + DWORD recv; - if (!PyArg_ParseTuple(arg, "kI:ioctl", &cmd, &option)) + if (!PyArg_ParseTuple(arg, "kO:ioctl", &cmd, &argO)) return NULL; - if (WSAIoctl(s->sock_fd, cmd, &option, sizeof(option), - NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) { - return set_error(); + switch (cmd) { + case SIO_RCVALL: { + unsigned int option = RCVALL_ON; + if (!PyArg_ParseTuple(arg, "kI:ioctl", &cmd, &option)) + return NULL; + if (WSAIoctl(s->sock_fd, cmd, &option, sizeof(option), + NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) { + return set_error(); + } + return PyLong_FromUnsignedLong(recv); } + case SIO_KEEPALIVE_VALS: { + struct tcp_keepalive ka; + if (!PyArg_ParseTuple(arg, "k(kkk):ioctl", &cmd, + &ka.onoff, &ka.keepalivetime, &ka.keepaliveinterval)) + return NULL; + if (WSAIoctl(s->sock_fd, cmd, &ka, sizeof(ka), + NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) { + return set_error(); + } + return PyLong_FromUnsignedLong(recv); } + default: + PyErr_Format(PyExc_ValueError, "invalid ioctl command %d", cmd); + return NULL; } - return PyLong_FromUnsignedLong(recv); } PyDoc_STRVAR(sock_ioctl_doc, "ioctl(cmd, option) -> long\n\ \n\ -Control the socket with WSAIoctl syscall. Currently only socket.SIO_RCVALL\n\ -is supported as control. Options must be one of the socket.RCVALL_*\n\ -constants."); +Control the socket with WSAIoctl syscall. Currently supported 'cmd' values are\n\ +SIO_RCVALL: 'option' must be one of the socket.RCVALL_* constants.\n\ +SIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval)."); #endif @@ -5290,11 +5309,16 @@ #ifdef SIO_RCVALL { - PyObject *tmp; - tmp = PyLong_FromUnsignedLong(SIO_RCVALL); - if (tmp == NULL) - return; - PyModule_AddObject(m, "SIO_RCVALL", tmp); + DWORD codes[] = {SIO_RCVALL, SIO_KEEPALIVE_VALS}; + const char *names[] = {"SIO_RCVALL", "SIO_KEEPALIVE_VALS"}; + int i; + for(i = 0; i<sizeof(codes)/sizeof(*codes); ++i) { + PyObject *tmp; + tmp = PyLong_FromUnsignedLong(codes[i]); + if (tmp == NULL) + return; + PyModule_AddObject(m, names[i], tmp); + } } PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF); PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);

1 0