Mailman 3 February 2011 - Python-checkins

cpython: Revert whitespace change.
by georg.brandl Feb. 28, 2011

Feb. 28, 2011

georg.brandl pushed 590870877f85 to cpython: http://hg.python.org/cpython/rev/590870877f85 changeset: 68067:590870877f85 tag: tip user: Georg Brandl <georg(a)python.org> date: Mon Feb 28 08:50:40 2011 +0100 summary: Revert whitespace change. files: Lib/ast.py diff --git a/Lib/ast.py b/Lib/ast.py --- a/Lib/ast.py +++ b/Lib/ast.py @@ -29,7 +29,7 @@ def parse(source, filename='<unknown>', mode='exec'): - """ + """ Parse the source into an AST node. Equivalent to compile(source, filename, mode, PyCF_ONLY_AST). """ -- Repository URL: http://hg.python.org/cpython

1 0

hooks: Clarify.
by georg.brandl Feb. 28, 2011

Feb. 28, 2011

georg.brandl pushed 41d7d7c2818c to hooks: http://hg.python.org/hooks/rev/41d7d7c2818c changeset: 33:41d7d7c2818c tag: tip user: Georg Brandl <georg(a)python.org> date: Mon Feb 28 08:41:18 2011 +0100 summary: Clarify. files: checkbranch.py checkheads.py diff --git a/checkbranch.py b/checkbranch.py --- a/checkbranch.py +++ b/checkbranch.py @@ -3,7 +3,7 @@ forbidden branch. To use the changeset hook in a local repository, include something like the -following in your hgrc file. +following in its hgrc file. [hooks] pretxnchangegroup.checkbranch = python:/home/hg/repos/hooks/checkbranch.py:hook diff --git a/checkheads.py b/checkheads.py --- a/checkheads.py +++ b/checkheads.py @@ -3,7 +3,7 @@ doesn't create new heads on any branch. To use the changeset hook in a local repository, include something like the -following in your hgrc file. +following in its hgrc file. [hooks] pretxnchangegroup.checkheads = python:/home/hg/repos/hooks/checkheads.py:hook -- Repository URL: http://hg.python.org/hooks

1 0

Daily py3k reference leaks (r88671): sum=0
by solipsis＠pitrou.net Feb. 28, 2011

Feb. 28, 2011

py3k results for svn r88671 (hg cset 271057c7c6f3) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogMkddHS', '-x']

1 0

r88674 - python/branches/release27-maint/Lib/test/test_unicode.py
by ezio.melotti Feb. 28, 2011

Feb. 28, 2011

Author: ezio.melotti Date: Mon Feb 28 02:42:29 2011 New Revision: 88674 Log: Python 2 can encode/decode surrogates to utf-8. Add a test for this. Modified: python/branches/release27-maint/Lib/test/test_unicode.py Modified: python/branches/release27-maint/Lib/test/test_unicode.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_unicode.py (original) +++ python/branches/release27-maint/Lib/test/test_unicode.py Mon Feb 28 02:42:29 2011 @@ -667,11 +667,17 @@ # see http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf # (table 3-7) and http://www.rfc-editor.org/rfc/rfc3629.txt #for cb in map(chr, range(0xA0, 0xC0)): - #sys.__stdout__.write('\\xED\\x%02x\\x80\n' % ord(cb)) #self.assertRaises(UnicodeDecodeError, #('\xED'+cb+'\x80').decode, 'utf-8') #self.assertRaises(UnicodeDecodeError, #('\xED'+cb+'\xBF').decode, 'utf-8') + # but since they are valid on Python 2 add a test for that: + for cb, surrogate in zip(map(chr, range(0xA0, 0xC0)), + map(unichr, range(0xd800, 0xe000, 64))): + encoded = '\xED'+cb+'\x80' + self.assertEqual(encoded.decode('utf-8'), surrogate) + self.assertEqual(surrogate.encode('utf-8'), encoded) + for cb in map(chr, range(0x80, 0x90)): self.assertRaises(UnicodeDecodeError, ('\xF0'+cb+'\x80\x80').decode, 'utf-8')

1 0

pymigr: Mention the checkheads hook
by antoine.pitrou Feb. 27, 2011

Feb. 27, 2011

antoine.pitrou pushed c2ef8c7fbe6d to pymigr: http://hg.python.org/pymigr/rev/c2ef8c7fbe6d changeset: 116:c2ef8c7fbe6d tag: tip user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Feb 27 23:23:23 2011 +0100 summary: Mention the checkheads hook files: README.txt diff --git a/README.txt b/README.txt --- a/README.txt +++ b/README.txt @@ -85,6 +85,7 @@ pretxnchangegroup.eol = python:/home/hg/mercurial-1.7.5/hgext/eol.py:allcsethook #pretxnchangegroup.eol = python:hgext.eol.hook + pretxnchangegroup.checkheads = python:/home/hg/repos/hooks/checkheads.py:hook pretxnchangegroup.checkbranch = python:/home/hg/repos/hooks/checkbranch.py:hook incoming.notify = python:/home/hg/repos/hooks/mail.py:incoming -- Repository URL: http://hg.python.org/pymigr

1 0

merge in devguide (hg_transition): Merged default
by brett.cannon Feb. 27, 2011

Feb. 27, 2011

brett.cannon pushed 4a1997d6cf53 to devguide: http://hg.python.org/devguide/rev/4a1997d6cf53 changeset: 345:4a1997d6cf53 branch: hg_transition parent: 338:c500a1efc984 parent: 344:e8ba3be88996 user: Brett Cannon <brett(a)python.org> date: Sun Feb 27 12:21:13 2011 -0800 summary: Merged default files: diff --git a/conf.py b/conf.py --- a/conf.py +++ b/conf.py @@ -43,7 +43,7 @@ # General information about the project. project = u'Python Developer\'s Guide' -copyright = u'2011, Brett Cannon' +copyright = u'2011, Python Software Foundation' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the -- Repository URL: http://hg.python.org/devguide

1 0

merge in devguide (hg_transition): Merge
by brett.cannon Feb. 27, 2011

Feb. 27, 2011

brett.cannon pushed a478c5a5a7b5 to devguide: http://hg.python.org/devguide/rev/a478c5a5a7b5 changeset: 346:a478c5a5a7b5 branch: hg_transition tag: tip parent: 345:4a1997d6cf53 parent: 343:6fcbafdf681f user: Brett Cannon <brett(a)python.org> date: Sun Feb 27 12:21:39 2011 -0800 summary: Merge files: diff --git a/committing.rst b/committing.rst --- a/committing.rst +++ b/committing.rst @@ -58,6 +58,44 @@ .. _collapse: http://mercurial.selenic.com/wiki/CollapseExtension +Minimal Configuration +--------------------- + +To use Mercurial as a committer (both of your and others' patches), you should +set up some basic options in your `configuration file`_. Under Windows, +TortoiseHg has a graphical settings dialog for most options, meaning you +don't need to edit the file directly (it is still available in +``%USERPROFILE%\Mercurial.ini``). Under other platforms, you must edit +``~/.hgrc``. + +Here are the minimal options you need to activate: + +* your *username*: this setting defines the name that will be used when you + :ref:`commit <hg-commit>` changes. The usual convention is to also include + an e-mail contact address in there:: + + [ui] + username = Your Name <email(a)example.org> + +* *extended diffing*: this setting enables an `extended diff format`_ + which is more useful than the standard unified diff format as it includes + metadata about file copies and permission bits:: + + [diff] + git = on + +Under Windows, you should also enable the `eol extension`_, which will +fix any Windows-specific line endings your text editor might insert when you +create or modify versioned files. The public repository has a hook which +will reject all changesets having the wrong line endings, so enabling this +extension on your local computer is in your best interest. + + +.. _configuration file: http://www.selenic.com/mercurial/hgrc.5.html#files +.. _extended diff format: http://www.selenic.com/mercurial/hg.1.html#diffs +.. _eol extension: http://mercurial.selenic.com/wiki/EolExtension + + Handling Other's Code --------------------- @@ -95,10 +133,6 @@ Porting Within a Major Version '''''''''''''''''''''''''''''' -.. note:: - XXX Update to using hg qimport if that ends up being the way non-core - developers are told to go. - Assume that Python 3.3 is the current in-development version of Python and that you have a patch that should also be applied to Python 3.2. To properly port the patch to both versions of Python, you should first apply the patch to @@ -150,11 +184,12 @@ "hg qimport -r tip -P" afterwards but that would add another level of complexity. -To move a patch between, e.g., Python 3.2 and 2.7, use the `transplant -extension`_. Assuming you committed in Python 2.7 first, to pull changeset -``a7df1a869e4a`` into Python 3.2, do:: +To port a patch from, e.g., Python 3.2 to 2.7, you can use the `transplant +extension`_. Assuming you first committed your changes as changeset +``a7df1a869e4a`` in the 3.2 branch and have now :ref:`updated +<hg-switch-branches>` your working copy to the 2.7 branch, do:: - hg transplant -s <URL to 2.7 repo> a7df1a869e4a + hg transplant a7df1a869e4a # Compile; run the test suite hg push diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -124,6 +124,8 @@ "default" branch (or any other branch, if such exists). +.. _hg-current-branch: + Which branch is currently checked out in my working copy? --------------------------------------------------------- @@ -142,6 +144,8 @@ update: (current) +.. _hg-switch-branches: + How do I switch between branches inside my working copy? -------------------------------------------------------- @@ -241,17 +245,32 @@ Run:: - hg pull <remote repository> - hg update + hg pull <remote repository> -from the directory you wish to update. The first command retrieves any -changes from the specified remote repository and merges them into the local -repository. The second commands updates the current directory and all its -subdirectories from the local repository. +from the repository you wish to pull the latest changes into. Most of the +time, that repository is a clone of the repository you want to pull from, +so you can simply type:: -You can combine the two commands in one by using:: + hg pull - hg pull -u <remote repository> +This doesn't update your working copy, though. See below: + + +How do I update my working copy with the latest changes? +-------------------------------------------------------- + +Do:: + + hg update + +This will update your working copy with the latest changes on the +:ref:`current branch <hg-current-branch>`. If you had :ref:`uncommitted +changes <hg-status>` in your working copy, they will be merged in. + +If you find yourself typing often ``hg pull`` followed by ``hg update``, +be aware that you can combine them in a single command:: + + hg pull -u .. _hg-local-workflow: diff --git a/patch.rst b/patch.rst --- a/patch.rst +++ b/patch.rst @@ -119,7 +119,7 @@ make patchcheck This will check and/or fix various common things people forget to do for -patches, such as adding any new files needing for the patch to work (do not +patches, such as adding any new files needing for the patch to work (note that not all checks apply to non-core developers). Assume you are using the :ref:`mq approach <mq-workflow>` suggested earlier, diff --git a/setup.rst b/setup.rst --- a/setup.rst +++ b/setup.rst @@ -21,28 +21,6 @@ <http://tortoisehg.org/>`_ graphical client. -Minimal Configuration -''''''''''''''''''''' - -To use ``hg`` on the command line, you should set up some basic options in -your `configuration file`_ (``~/.hgrc`` on POSIX, -``%USERPROFILE%\Mercurial.ini`` on Windows). :: - - [ui] - username = Your Name <email(a)example.org> - - [diff] - git = on - -The first setting defines the name that will be used when you :ref:`commit -<hg-commit>` changes. The second setting enables an `extended diff format`_ -which is more useful than the standard unified diff format. - -Note that TortoiseHg has a graphical settings dialog. - -.. _configuration file: http://www.selenic.com/mercurial/hgrc.5.html#files -.. _extended diff format: http://www.selenic.com/mercurial/hg.1.html#diffs - .. _checkout: Getting the Source Code -- Repository URL: http://hg.python.org/devguide

1 0

devguide: Fix the copyright notice.
by brett.cannon Feb. 27, 2011

Feb. 27, 2011

brett.cannon pushed e8ba3be88996 to devguide: http://hg.python.org/devguide/rev/e8ba3be88996 changeset: 344:e8ba3be88996 parent: 337:7ce1bf0f6f5d user: Brett Cannon <brett(a)python.org> date: Sun Feb 27 12:20:51 2011 -0800 summary: Fix the copyright notice. files: conf.py diff --git a/conf.py b/conf.py --- a/conf.py +++ b/conf.py @@ -43,7 +43,7 @@ # General information about the project. project = u'Python Developer\'s Guide' -copyright = u'2011, Brett Cannon' +copyright = u'2011, Python Software Foundation' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the -- Repository URL: http://hg.python.org/devguide

1 0

devguide (hg_transition): Separate "hg pull" and "hg update" entries
by antoine.pitrou Feb. 27, 2011

Feb. 27, 2011

antoine.pitrou pushed 6fcbafdf681f to devguide: http://hg.python.org/devguide/rev/6fcbafdf681f changeset: 343:6fcbafdf681f branch: hg_transition tag: tip user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Feb 27 20:34:00 2011 +0100 summary: Separate "hg pull" and "hg update" entries files: faq.rst diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -124,6 +124,8 @@ "default" branch (or any other branch, if such exists). +.. _hg-current-branch: + Which branch is currently checked out in my working copy? --------------------------------------------------------- @@ -243,17 +245,32 @@ Run:: - hg pull <remote repository> - hg update + hg pull <remote repository> -from the directory you wish to update. The first command retrieves any -changes from the specified remote repository and merges them into the local -repository. The second commands updates the current directory and all its -subdirectories from the local repository. +from the repository you wish to pull the latest changes into. Most of the +time, that repository is a clone of the repository you want to pull from, +so you can simply type:: -You can combine the two commands in one by using:: + hg pull - hg pull -u <remote repository> +This doesn't update your working copy, though. See below: + + +How do I update my working copy with the latest changes? +-------------------------------------------------------- + +Do:: + + hg update + +This will update your working copy with the latest changes on the +:ref:`current branch <hg-current-branch>`. If you had :ref:`uncommitted +changes <hg-status>` in your working copy, they will be merged in. + +If you find yourself typing often ``hg pull`` followed by ``hg update``, +be aware that you can combine them in a single command:: + + hg pull -u .. _hg-local-workflow: -- Repository URL: http://hg.python.org/devguide

1 0

devguide (hg_transition): Drop the "-s" option to hg transplant and improve wording
by antoine.pitrou Feb. 27, 2011

Feb. 27, 2011

antoine.pitrou pushed 15e302905a5b to devguide: http://hg.python.org/devguide/rev/15e302905a5b changeset: 342:15e302905a5b branch: hg_transition tag: tip user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Feb 27 20:25:04 2011 +0100 summary: Drop the "-s" option to hg transplant and improve wording files: committing.rst faq.rst diff --git a/committing.rst b/committing.rst --- a/committing.rst +++ b/committing.rst @@ -184,11 +184,12 @@ "hg qimport -r tip -P" afterwards but that would add another level of complexity. -To move a patch between, e.g., Python 3.2 and 2.7, use the `transplant -extension`_. Assuming you committed in Python 2.7 first, to pull changeset -``a7df1a869e4a`` into Python 3.2, do:: +To port a patch from, e.g., Python 3.2 to 2.7, you can use the `transplant +extension`_. Assuming you first committed your changes as changeset +``a7df1a869e4a`` in the 3.2 branch and have now :ref:`updated +<hg-switch-branches>` your working copy to the 2.7 branch, do:: - hg transplant -s <URL to 2.7 repo> a7df1a869e4a + hg transplant a7df1a869e4a # Compile; run the test suite hg push diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -142,6 +142,8 @@ update: (current) +.. _hg-switch-branches: + How do I switch between branches inside my working copy? -------------------------------------------------------- -- Repository URL: http://hg.python.org/devguide

1 0