Mailman 3 January 2012 - Python-checkins

Re: [Python-checkins] cpython: pyexpat uses the new Unicode API
by Amaury Forgeot d'Arc 29 Jul '12

29 Jul '12

> changeset: 72548:a1be34457ccf > user: Victor Stinner <victor.stinner at haypocalc.com> > date: Sat Oct 01 01:05:40 2011 +0200 > summary: > pyexat uses the new Unicode API > > files: > Modules/pyexpat.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > > diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c > --- a/Modules/pyexpat.c > +++ b/Modules/pyexpat.c > @@ -1234,11 +1234,13 @@ > static PyObject * > xmlparse_getattro(xmlparseobject *self, PyObject *nameobj) > { > - const Py_UNICODE *name; > + Py_UCS4 first_char; > int handlernum = -1; > > if (!PyUnicode_Check(nameobj)) > goto generic; > + if (PyUnicode_READY(nameobj)) > + return NULL; Why is this PyUnicode_READY necessary? Can tp_getattro pass unfinished unicode objects? I hope we don't have to update all extension modules? -- Amaury Forgeot d'Arc

2 1

cpython: Issue #13706: Add assertions to detect bugs earlier
by victor.stinner 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/056f5cc8885d changeset: 74702:056f5cc8885d user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Feb 01 00:22:23 2012 +0100 summary: Issue #13706: Add assertions to detect bugs earlier files: Include/unicodeobject.h | 3 +++ Python/formatter_unicode.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -499,14 +499,17 @@ do { \ switch ((kind)) { \ case PyUnicode_1BYTE_KIND: { \ + assert(value <= 0xff); \ ((Py_UCS1 *)(data))[(index)] = (Py_UCS1)(value); \ break; \ } \ case PyUnicode_2BYTE_KIND: { \ + assert(value <= 0xffff); \ ((Py_UCS2 *)(data))[(index)] = (Py_UCS2)(value); \ break; \ } \ default: { \ + assert(value <= 0x10ffff); \ assert((kind) == PyUnicode_4BYTE_KIND); \ ((Py_UCS4 *)(data))[(index)] = (Py_UCS4)(value); \ } \ diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -559,8 +559,9 @@ Py_ssize_t t; for (t = 0; t < spec->n_prefix; t++) { Py_UCS4 c = PyUnicode_READ(kind, data, pos + t); + c = Py_TOUPPER(c); assert (c <= 127); - PyUnicode_WRITE(kind, data, pos + t, Py_TOUPPER(c)); + PyUnicode_WRITE(kind, data, pos + t, c); } } pos += spec->n_prefix; @@ -603,11 +604,12 @@ Py_ssize_t t; for (t = 0; t < spec->n_grouped_digits; t++) { Py_UCS4 c = PyUnicode_READ(kind, data, pos + t); + c = Py_TOUPPER(c); if (c > 127) { PyErr_SetString(PyExc_SystemError, "non-ascii grouped digit"); return -1; } - PyUnicode_WRITE(kind, data, pos + t, Py_TOUPPER(c)); + PyUnicode_WRITE(kind, data, pos + t, c); } } pos += spec->n_grouped_digits; @@ -733,6 +735,7 @@ Py_CLEAR(result); done: + assert(!result || _PyUnicode_CheckConsistency(result, 1)); return result; } @@ -759,7 +762,7 @@ produces non-digits */ Py_ssize_t n_prefix = 0; /* Count of prefix chars, (e.g., '0x') */ Py_ssize_t n_total; - Py_ssize_t prefix; + Py_ssize_t prefix = 0; NumberFieldWidths spec; long x; int err; @@ -894,6 +897,7 @@ done: Py_XDECREF(tmp); + assert(!result || _PyUnicode_CheckConsistency(result, 1)); return result; } @@ -1036,6 +1040,7 @@ done: PyMem_Free(buf); Py_DECREF(unicode_tmp); + assert(!result || _PyUnicode_CheckConsistency(result, 1)); return result; } @@ -1270,6 +1275,7 @@ PyMem_Free(im_buf); Py_XDECREF(re_unicode_tmp); Py_XDECREF(im_unicode_tmp); + assert(!result || _PyUnicode_CheckConsistency(result, 1)); return result; } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix a minor output typo as found by Terry Reedy.
by brett.cannon 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/b74a77fee744 changeset: 74701:b74a77fee744 user: Brett Cannon <brett(a)python.org> date: Tue Jan 31 17:02:10 2012 -0500 summary: Fix a minor output typo as found by Terry Reedy. files: Lib/importlib/test/benchmark.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/importlib/test/benchmark.py b/Lib/importlib/test/benchmark.py --- a/Lib/importlib/test/benchmark.py +++ b/Lib/importlib/test/benchmark.py @@ -201,7 +201,7 @@ '(incompatible w/ --benchmark)') parser.add_argument('--benchmark', dest='benchmark', help='specific benchmark to run ' - '(incompatible w/ --file') + '(incompatible w/ --file)') options = parser.parse_args() if options.filename and options.benchmark: print('Cannot specify a benchmark *and* read/write results') -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Let importlib.test.benchmark take a specific benchmark name to run.
by brett.cannon 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/2d0ff4d82b14 changeset: 74699:2d0ff4d82b14 user: Brett Cannon <brett(a)python.org> date: Mon Jan 30 19:27:51 2012 -0500 summary: Let importlib.test.benchmark take a specific benchmark name to run. files: Lib/importlib/test/benchmark.py | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Lib/importlib/test/benchmark.py b/Lib/importlib/test/benchmark.py --- a/Lib/importlib/test/benchmark.py +++ b/Lib/importlib/test/benchmark.py @@ -133,7 +133,7 @@ yield result -def main(import_, filename=None): +def main(import_, filename=None, benchmark=None): if filename and os.path.exists(filename): with open(filename, 'r') as file: prev_results = json.load(file) @@ -145,6 +145,14 @@ source_writing_bytecode, decimal_using_bytecode, decimal_writing_bytecode, decimal_wo_bytecode,) + if benchmark: + for b in benchmarks: + if b.__doc__ == benchmark: + benchmarks = [b] + break + else: + print('Unknown benchmark: {!r}'.format(benchmark, file=sys.stderr)) + sys.exit(1) seconds = 1 seconds_plural = 's' if seconds > 1 else '' repeat = 3 @@ -189,10 +197,17 @@ parser.add_argument('-b', '--builtin', dest='builtin', action='store_true', default=False, help="use the built-in __import__") parser.add_argument('-f', '--file', dest='filename', default=None, - help='file to read/write results from/to') + help='file to read/write results from/to' + '(incompatible w/ --benchmark)') + parser.add_argument('--benchmark', dest='benchmark', + help='specific benchmark to run ' + '(incompatible w/ --file') options = parser.parse_args() + if options.filename and options.benchmark: + print('Cannot specify a benchmark *and* read/write results') + sys.exit(1) import_ = __import__ if not options.builtin: import_ = importlib.__import__ - main(import_, options.filename) + main(import_, options.filename, options.benchmark) -- Repository URL: http://hg.python.org/cpython

2 1

cpython (merge default -> default): Merge
by brett.cannon 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/06d47538af89 changeset: 74700:06d47538af89 parent: 74699:2d0ff4d82b14 parent: 74697:bf31815548c9 user: Brett Cannon <brett(a)python.org> date: Tue Jan 31 14:58:07 2012 -0500 summary: Merge files: Lib/idlelib/PyShell.py | 19 +++++++++++++------ Lib/idlelib/ScriptBinding.py | 5 ++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/zipimport.c | 9 +++++---- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -411,11 +411,11 @@ self.rpcclt.register("flist", self.tkconsole.flist) self.rpcclt.register("linecache", linecache) self.rpcclt.register("interp", self) - self.transfer_path() + self.transfer_path(with_cwd=True) self.poll_subprocess() return self.rpcclt - def restart_subprocess(self): + def restart_subprocess(self, with_cwd=False): if self.restarting: return self.rpcclt self.restarting = True @@ -439,7 +439,7 @@ except socket.timeout as err: self.display_no_subprocess_error() return None - self.transfer_path() + self.transfer_path(with_cwd=with_cwd) # annotate restart in shell window and mark it console.text.delete("iomark", "end-1c") if was_executing: @@ -492,12 +492,18 @@ except OSError: return - def transfer_path(self): + def transfer_path(self, with_cwd=False): + if with_cwd: # Issue 13506 + path = [''] # include Current Working Directory + path.extend(sys.path) + else: + path = sys.path + self.runcommand("""if 1: import sys as _sys _sys.path = %r del _sys - \n""" % (sys.path,)) + \n""" % (path,)) active_seq = None @@ -1191,7 +1197,8 @@ self.text.see("restart") def restart_shell(self, event=None): - self.interp.restart_subprocess() + "Callback for Run/Restart Shell Cntl-F6" + self.interp.restart_subprocess(with_cwd=True) def showprompt(self): self.resetoutput() diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -144,10 +144,9 @@ return 'break' if not self.tabnanny(filename): return 'break' - shell = self.shell - interp = shell.interp + interp = self.shell.interp if PyShell.use_subprocess: - shell.restart_shell() + interp.restart_subprocess(with_cwd=False) dirname = os.path.dirname(filename) # XXX Too often this discards arguments the user just set... interp.runcommand("""if 1: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -880,6 +880,7 @@ Ty Sarna Ben Sayer sbt +Marco Scataglini Andrew Schaaf Michael Scharf Andreas Schawo diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -463,6 +463,9 @@ Library ------- +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + - Issue #8828: Add new function os.replace(), for cross-platform renaming with overwriting. diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -728,14 +728,15 @@ PyObject *files = NULL; FILE *fp; unsigned short flags; - long compress, crc, data_size, file_size, file_offset, date, time; - long header_offset, name_size, header_size, header_position; + short compress, time, date, name_size; + long crc, data_size, file_size, header_size; + Py_ssize_t file_offset, header_position, header_offset; long l, count; Py_ssize_t i; char name[MAXPATHLEN + 5]; PyObject *nameobj = NULL; char *p, endof_central_dir[22]; - long arc_offset; /* offset from beginning of file to start of zip-archive */ + Py_ssize_t arc_offset; /* Absolute offset to start of the zip-archive. */ PyObject *path; const char *charset; int bootstrap; @@ -835,7 +836,7 @@ path = PyUnicode_FromFormat("%U%c%U", archive, SEP, nameobj); if (path == NULL) goto error; - t = Py_BuildValue("Niiiiiii", path, compress, data_size, + t = Py_BuildValue("Nhllnhhl", path, compress, data_size, file_size, file_offset, time, date, crc); if (t == NULL) goto error; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Allow for the specification of a file to dump importlib benchmark
by brett.cannon 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/fc007eef3c0b changeset: 74698:fc007eef3c0b parent: 74689:80ddbd822227 user: Brett Cannon <brett(a)python.org> date: Mon Jan 30 19:12:29 2012 -0500 summary: Allow for the specification of a file to dump importlib benchmark results to (and to compare against previous runs). * * * Move importlib.test.benchmark to argparse. files: Lib/importlib/test/benchmark.py | 46 ++++++++++++++++---- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Lib/importlib/test/benchmark.py b/Lib/importlib/test/benchmark.py --- a/Lib/importlib/test/benchmark.py +++ b/Lib/importlib/test/benchmark.py @@ -9,6 +9,7 @@ import decimal import imp import importlib +import json import os import py_compile import sys @@ -132,7 +133,12 @@ yield result -def main(import_): +def main(import_, filename=None): + if filename and os.path.exists(filename): + with open(filename, 'r') as file: + prev_results = json.load(file) + else: + prev_results = {} __builtins__.__import__ = import_ benchmarks = (from_cache, builtin_mod, source_using_bytecode, source_wo_bytecode, @@ -142,8 +148,11 @@ seconds = 1 seconds_plural = 's' if seconds > 1 else '' repeat = 3 - header = "Measuring imports/second over {} second{}, best out of {}\n" - print(header.format(seconds, seconds_plural, repeat)) + header = ('Measuring imports/second over {} second{}, best out of {}\n' + 'Entire benchmark run should take about {} seconds\n') + print(header.format(seconds, seconds_plural, repeat, + len(benchmarks) * seconds * repeat)) + new_results = {} for benchmark in benchmarks: print(benchmark.__doc__, "[", end=' ') sys.stdout.flush() @@ -154,19 +163,36 @@ sys.stdout.flush() assert not sys.dont_write_bytecode print("]", "best is", format(max(results), ',d')) + new_results[benchmark.__doc__] = results + prev_results[import_.__module__] = new_results + if 'importlib._bootstrap' in prev_results and 'builtins' in prev_results: + print('\n\nComparing importlib vs. __import__\n') + importlib_results = prev_results['importlib._bootstrap'] + builtins_results = prev_results['builtins'] + for benchmark in benchmarks: + benchmark_name = benchmark.__doc__ + importlib_result = max(importlib_results[benchmark_name]) + builtins_result = max(builtins_results[benchmark_name]) + result = '{:,d} vs. {:,d} ({:%})'.format(importlib_result, + builtins_result, + importlib_result/builtins_result) + print(benchmark_name, ':', result) + if filename: + with open(filename, 'w') as file: + json.dump(prev_results, file, indent=2) if __name__ == '__main__': - import optparse + import argparse - parser = optparse.OptionParser() - parser.add_option('-b', '--builtin', dest='builtin', action='store_true', + parser = argparse.ArgumentParser() + parser.add_argument('-b', '--builtin', dest='builtin', action='store_true', default=False, help="use the built-in __import__") - options, args = parser.parse_args() - if args: - raise RuntimeError("unrecognized args: {}".format(args)) + parser.add_argument('-f', '--file', dest='filename', default=None, + help='file to read/write results from/to') + options = parser.parse_args() import_ = __import__ if not options.builtin: import_ = importlib.__import__ - main(import_) + main(import_, options.filename) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): whitespace
by terry.reedy 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/89b699e68fa2 changeset: 74696:89b699e68fa2 branch: 3.2 parent: 74693:1993aa091d89 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jan 31 02:57:29 2012 -0500 summary: whitespace files: Lib/idlelib/PyShell.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -494,7 +494,7 @@ path.extend(sys.path) else: path = sys.path - + self.runcommand("""if 1: import sys as _sys _sys.path = %r -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge with 3.2 whitespace
by terry.reedy 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/bf31815548c9 changeset: 74697:bf31815548c9 parent: 74694:acedd92086c5 parent: 74696:89b699e68fa2 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jan 31 02:58:39 2012 -0500 summary: Merge with 3.2 whitespace files: Lib/idlelib/PyShell.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -498,7 +498,7 @@ path.extend(sys.path) else: path = sys.path - + self.runcommand("""if 1: import sys as _sys _sys.path = %r -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): whitespace3
by terry.reedy 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/822d7a1f8885 changeset: 74695:822d7a1f8885 branch: 2.7 parent: 74692:1b5abba0c808 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jan 31 02:55:32 2012 -0500 summary: whitespace3 files: Lib/idlelib/PyShell.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -507,7 +507,7 @@ path.extend(sys.path) else: path = sys.path - + self.runcommand("""if 1: import sys as _sys _sys.path = %r -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge 3.2
by terry.reedy 31 Jan '12

31 Jan '12

http://hg.python.org/cpython/rev/acedd92086c5 changeset: 74694:acedd92086c5 parent: 74691:2db416b953e8 parent: 74693:1993aa091d89 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jan 31 02:42:19 2012 -0500 summary: Merge 3.2 - Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. Original patches by Marco Scataglini and Roger Serwy. Merge 3.2 #13506 Add '' to path for interactive interpreter by adding with_cwd parameter to PyShell.PyShell.transfer_path() and changing elsewhere as needed. Original patches by Marco Scataglini and Roger Serwy. files: Lib/idlelib/PyShell.py | 19 +++++++++++++------ Lib/idlelib/ScriptBinding.py | 5 ++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -411,11 +411,11 @@ self.rpcclt.register("flist", self.tkconsole.flist) self.rpcclt.register("linecache", linecache) self.rpcclt.register("interp", self) - self.transfer_path() + self.transfer_path(with_cwd=True) self.poll_subprocess() return self.rpcclt - def restart_subprocess(self): + def restart_subprocess(self, with_cwd=False): if self.restarting: return self.rpcclt self.restarting = True @@ -439,7 +439,7 @@ except socket.timeout as err: self.display_no_subprocess_error() return None - self.transfer_path() + self.transfer_path(with_cwd=with_cwd) # annotate restart in shell window and mark it console.text.delete("iomark", "end-1c") if was_executing: @@ -492,12 +492,18 @@ except OSError: return - def transfer_path(self): + def transfer_path(self, with_cwd=False): + if with_cwd: # Issue 13506 + path = [''] # include Current Working Directory + path.extend(sys.path) + else: + path = sys.path + self.runcommand("""if 1: import sys as _sys _sys.path = %r del _sys - \n""" % (sys.path,)) + \n""" % (path,)) active_seq = None @@ -1191,7 +1197,8 @@ self.text.see("restart") def restart_shell(self, event=None): - self.interp.restart_subprocess() + "Callback for Run/Restart Shell Cntl-F6" + self.interp.restart_subprocess(with_cwd=True) def showprompt(self): self.resetoutput() diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -144,10 +144,9 @@ return 'break' if not self.tabnanny(filename): return 'break' - shell = self.shell - interp = shell.interp + interp = self.shell.interp if PyShell.use_subprocess: - shell.restart_shell() + interp.restart_subprocess(with_cwd=False) dirname = os.path.dirname(filename) # XXX Too often this discards arguments the user just set... interp.runcommand("""if 1: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -880,6 +880,7 @@ Ty Sarna Ben Sayer sbt +Marco Scataglini Andrew Schaaf Michael Scharf Andreas Schawo diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -463,6 +463,9 @@ Library ------- +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + - Issue #8828: Add new function os.replace(), for cross-platform renaming with overwriting. -- Repository URL: http://hg.python.org/cpython

1 0