Mailman 3 July 2012 - Python-checkins

cpython: - Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module.
by matthias.klose 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/7be082d80b8a changeset: 77911:7be082d80b8a user: doko(a)ubuntu.com date: Sun Jul 01 10:35:54 2012 +0200 summary: - Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. files: Misc/NEWS | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -51,6 +51,8 @@ - Issue #14330: For cross builds, don't use host python, use host search paths for host compiler. +- Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module. + What's New in Python 3.3.0 Beta 1? ================================== diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -830,7 +830,7 @@ # a release. Most open source OSes come with one or more # versions of BerkeleyDB already installed. - max_db_ver = (5, 1) + max_db_ver = (5, 3) min_db_ver = (3, 3) db_setup_debug = False # verbose debug prints from this script? -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix filename.
by georg.brandl 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/b31fef9f65dc changeset: 77910:b31fef9f65dc user: Georg Brandl <georg(a)python.org> date: Sun Jul 01 10:04:35 2012 +0200 summary: Fix filename. files: Tools/scripts/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/scripts/README b/Tools/scripts/README --- a/Tools/scripts/README +++ b/Tools/scripts/README @@ -47,7 +47,7 @@ pickle2db.py Load a pickle generated by db2pickle.py to a database pindent.py Indent Python code, giving block-closing comments ptags.py Create vi tags file for Python modules -pycolorize Python syntax highlighting with HTML output. +pycolorize.py Python syntax highlighting with HTML output pydoc3 Python documentation browser pysource.py Find Python source files redemo.py Basic regular expression demonstration facility -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge with 3.2.
by georg.brandl 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/071bdd4a636b changeset: 77909:071bdd4a636b parent: 77904:fae140c00954 parent: 77908:031862264304 user: Georg Brandl <georg(a)python.org> date: Sun Jul 01 09:56:07 2012 +0200 summary: Merge with 3.2. files: Doc/extending/embedding.rst | 4 ++-- Doc/library/multiprocessing.rst | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -155,13 +155,13 @@ interesting part with respect to embedding Python starts with :: Py_Initialize(); - pName = PyString_FromString(argv[1]); + pName = PyUnicode_FromString(argv[1]); /* Error checking of pName left out */ pModule = PyImport_Import(pName); After initializing the interpreter, the script is loaded using :c:func:`PyImport_Import`. This routine needs a Python string as its argument, -which is constructed using the :c:func:`PyString_FromString` data conversion +which is constructed using the :c:func:`PyUnicode_FromString` data conversion routine. :: pFunc = PyObject_GetAttrString(pModule, argv[2]); diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -79,7 +79,8 @@ def info(title): print(title) print('module name:', __name__) - print('parent process:', os.getppid()) + if hasattr(os, 'getppid'): # only available on Unix + print('parent process:', os.getppid()) print('process id:', os.getpid()) def f(name): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Make call of os.getppid() conditional: it is not available on Windows.
by georg.brandl 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/031862264304 changeset: 77908:031862264304 branch: 3.2 user: Georg Brandl <georg(a)python.org> date: Sun Jul 01 09:47:54 2012 +0200 summary: Make call of os.getppid() conditional: it is not available on Windows. files: Doc/library/multiprocessing.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -79,7 +79,8 @@ def info(title): print(title) print('module name:', __name__) - print('parent process:', os.getppid()) + if hasattr(os, 'getppid'): # only available on Unix + print('parent process:', os.getppid()) print('process id:', os.getpid()) def f(name): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix inconsistent function name in embedding howto.
by georg.brandl 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/275601fdc285 changeset: 77907:275601fdc285 branch: 3.2 parent: 77882:177f93f0f5b9 user: Georg Brandl <georg(a)python.org> date: Sun Jul 01 09:43:20 2012 +0200 summary: Fix inconsistent function name in embedding howto. files: Doc/extending/embedding.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -155,13 +155,13 @@ interesting part with respect to embedding Python starts with :: Py_Initialize(); - pName = PyString_FromString(argv[1]); + pName = PyUnicode_FromString(argv[1]); /* Error checking of pName left out */ pModule = PyImport_Import(pName); After initializing the interpreter, the script is loaded using :c:func:`PyImport_Import`. This routine needs a Python string as its argument, -which is constructed using the :c:func:`PyString_FromString` data conversion +which is constructed using the :c:func:`PyUnicode_FromString` data conversion routine. :: pFunc = PyObject_GetAttrString(pModule, argv[2]); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Make call of os.getppid() conditional: it is not available on Windows.
by georg.brandl 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/65dd71ebf28f changeset: 77906:65dd71ebf28f branch: 2.7 user: Georg Brandl <georg(a)python.org> date: Sun Jul 01 09:47:54 2012 +0200 summary: Make call of os.getppid() conditional: it is not available on Windows. files: Doc/library/multiprocessing.rst | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -81,7 +81,8 @@ def info(title): print title print 'module name:', __name__ - print 'parent process:', os.getppid() + if hasattr(os, 'getppid'): # only available on Unix + print 'parent process:', os.getppid() print 'process id:', os.getpid() def f(name): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Remove an unneeded footnote.
by georg.brandl 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/dd618635efb8 changeset: 77905:dd618635efb8 branch: 2.7 parent: 77884:97445ca895d5 user: Georg Brandl <georg(a)python.org> date: Sun Jul 01 09:40:16 2012 +0200 summary: Remove an unneeded footnote. files: Doc/library/profile.rst | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -607,13 +607,10 @@ best results with a custom timer, it might be necessary to hard-code it in the C source of the internal :mod:`_lsprof` module. + .. rubric:: Footnotes -.. [#] Updated and converted to LaTeX by Guido van Rossum. Further updated by Armin - Rigo to integrate the documentation for the new :mod:`cProfile` module of Python - 2.5. - -.. [#] Prior to Python 2.2, it was necessary to edit the profiler source code to embed - the bias as a literal number. You still can, but that method is no longer +.. [#] Prior to Python 2.2, it was necessary to edit the profiler source code to + embed the bias as a literal number. You still can, but that method is no longer described, because no longer needed. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Limit which operators get colorized
by raymond.hettinger 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/fae140c00954 changeset: 77904:fae140c00954 user: Raymond Hettinger <python(a)rcn.com> date: Sun Jul 01 00:37:05 2012 -0700 summary: Limit which operators get colorized files: Tools/scripts/pycolorize.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/scripts/pycolorize.py b/Tools/scripts/pycolorize.py --- a/Tools/scripts/pycolorize.py +++ b/Tools/scripts/pycolorize.py @@ -28,7 +28,7 @@ kind, prev_kind = '', kind if tok_type == tokenize.COMMENT: kind = 'comment' - elif tok_type == tokenize.OP: + elif tok_type == tokenize.OP and tok_str[:1] not in '{}[](),.:;': kind = 'operator' elif tok_type == tokenize.STRING: kind = 'string' -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Set title to the source filename
by raymond.hettinger 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/21ca7f56e12c changeset: 77903:21ca7f56e12c user: Raymond Hettinger <python(a)rcn.com> date: Sat Jun 30 23:19:30 2012 -0700 summary: Set title to the source filename files: Tools/scripts/pycolorize.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Tools/scripts/pycolorize.py b/Tools/scripts/pycolorize.py --- a/Tools/scripts/pycolorize.py +++ b/Tools/scripts/pycolorize.py @@ -2,7 +2,7 @@ 'Convert Python source code to HTML with colorized markup' __all__ = ['colorize', 'build_page', 'default_css', 'default_html'] -__author__ = 'Raymond Hettinger' +__author__ = 'Raymond Hettinger' import keyword, tokenize, cgi, functools @@ -71,7 +71,7 @@ <html> <head> <meta http-equiv="Content-type" content="text/html;charset=UTF-8"> -<title> Python Code </title> +<title> %s </title> <style type="text/css"> %s </style> @@ -82,11 +82,12 @@ </html> ''' -def build_page(source, html=default_html, css=default_css): +def build_page(source, title='python', css=default_css, html=default_html): 'Create a complete HTML page with colorized Python source code' css_str = '\n'.join(['%s %s' % item for item in css.items()]) result = colorize(source) - return html % (css_str, result) + title = cgi.escape(title) + return html % (title, css_str, result) if __name__ == '__main__': @@ -108,7 +109,7 @@ sourcefile = args.sourcefile[0] with open(sourcefile) as f: page = f.read() - html = colorize(page) if args.standalone else build_page(page) + html = colorize(page) if args.standalone else build_page(page, title=sourcefile) if args.browser: htmlfile = os.path.splitext(os.path.basename(sourcefile))[0] + '.html' with open(htmlfile, 'w') as f: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Small cleanups
by raymond.hettinger 01 Jul '12

01 Jul '12

http://hg.python.org/cpython/rev/d02588a26057 changeset: 77902:d02588a26057 user: Raymond Hettinger <python(a)rcn.com> date: Sat Jun 30 22:19:04 2012 -0700 summary: Small cleanups files: Tools/scripts/README | 1 + Tools/scripts/pycolorize.py | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Tools/scripts/README b/Tools/scripts/README --- a/Tools/scripts/README +++ b/Tools/scripts/README @@ -47,6 +47,7 @@ pickle2db.py Load a pickle generated by db2pickle.py to a database pindent.py Indent Python code, giving block-closing comments ptags.py Create vi tags file for Python modules +pycolorize Python syntax highlighting with HTML output. pydoc3 Python documentation browser pysource.py Find Python source files redemo.py Basic regular expression demonstration facility diff --git a/Tools/scripts/pycolorize.py b/Tools/scripts/pycolorize.py --- a/Tools/scripts/pycolorize.py +++ b/Tools/scripts/pycolorize.py @@ -66,17 +66,25 @@ } default_html = '''\ -<html><head><style type="text/css"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<meta http-equiv="Content-type" content="text/html;charset=UTF-8"> +<title> Python Code </title> +<style type="text/css"> %s -</style></head> +</style> +</head> <body> %s -</body></html> +</body> +</html> ''' def build_page(source, html=default_html, css=default_css): 'Create a complete HTML page with colorized Python source code' - css_str = ''.join(['%s %s\n' % item for item in css.items()]) + css_str = '\n'.join(['%s %s' % item for item in css.items()]) result = colorize(source) return html % (css_str, result) -- Repository URL: http://hg.python.org/cpython

1 0