Mailman 3 February 2011 - Python-checkins

devinabox: Have commands run quietly.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed e9bb550d8cd2 to devinabox: http://hg.python.org/devinabox/rev/e9bb550d8cd2 changeset: 7:e9bb550d8cd2 user: Brett Cannon <brett(a)python.org> date: Fri Feb 25 17:32:06 2011 -0800 summary: Have commands run quietly. files: box.py diff --git a/box.py b/box.py --- a/box.py +++ b/box.py @@ -116,13 +116,13 @@ def create(self): """Clone an Hg repository to 'directory'.""" - subprocess.check_call(['hg', 'clone', self.url, self.directory]) + subprocess.check_call(['hg', '-q', 'clone', self.url, self.directory]) def update(self): """Update the Hg clone in 'directory'.""" with change_cwd(self.directory): - subprocess.check_call(['hg', 'pull']) - subprocess.check_call(['hg', 'update']) + subprocess.check_call(['hg', '-q', 'pull']) + subprocess.check_call(['hg', '-q', 'update']) class SvnProvider(Provider): @@ -136,11 +136,12 @@ def create(self): """Check out the svn repository to 'directory'.""" - subprocess.check_call(['svn', 'checkout', self.url, self.directory]) + subprocess.check_call(['svn', 'checkout', '-q', + self.url, self.directory]) def update(self): """Update the svn checkout in 'directory'.""" - subprocess.check_call(['svn', 'update', self.directory]) + subprocess.check_call(['svn', 'update', '-q', self.directory]) class Visual_Studio_Express(Provider): @@ -300,9 +301,8 @@ # XXX --basic option (everything that doesn't require a Web browser) # XXX --miniumum option (cpython, devguide, peps) # XXX --build option - # XXX --with-coverage option parser_update = subparsers.add_parser('update') # XXX help - # XXX also run build (--with-coverage) + # XXX also run build -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Code up more build rules for documentation.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed fa02baedf1d6 to devinabox: http://hg.python.org/devinabox/rev/fa02baedf1d6 changeset: 5:fa02baedf1d6 user: Brett Cannon <brett(a)python.org> date: Fri Feb 25 17:08:51 2011 -0800 summary: Code up more build rules for documentation. files: box.py diff --git a/box.py b/box.py --- a/box.py +++ b/box.py @@ -57,7 +57,8 @@ """ # XXX README or just the docstring for this script? -# XXX Script to run thorough test suite? +# XXX script to build CPython? multiprocessing.cpu_count(). Windows? +# XXX script to run unit tests? multiprocessing.cpu_count() import abc import contextlib @@ -237,7 +238,20 @@ url = 'http://hg.python.org/devguide' directory = 'devguide' - # XXX build (and symlink the index); use Sphinx from docs + def build(self): + """Build the devguide and symlink its index page.""" + # Grab Sphinx from cpython/Doc/tools/ + tools_directory = os.path.join(CPython.directory, 'Doc', 'tools') + orig_pythonpath = os.environ['PYTHONPATH'] + os.environ['PYTHONPATH'] = os.path.abspath(tools_directory) + try: + with change_cwd(self.directory): + subprocess.check_call(['make', 'html']) + finally: + os.environ['PYTHONPATH'] = orig_pythonpath + index_path = os.path.join(self.directory, '_build', 'html', + 'index.html') + os.symlink(index_path, 'devguide.html') class PEPs(SvnProvider): @@ -271,10 +285,9 @@ with change_cwd(os.path.join(self.directory, 'Doc')): subprocess.check_call(['make', 'checkout']) - # XXX build docs (and symlink) - # XXX script to build CPython? multiprocessing.cpu_count(). Windows? - # XXX script to run unit tests? multiprocessing.cpu_count() - + def build(self): + with change_cwd(os.path.join(self.directory, 'Doc'): + subprocess.check_call(['make', 'html']) if __name__ == '__main__': -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Add a script which will build CPython.
by brett.cannon Feb. 28, 2011

Feb. 28, 2011

brett.cannon pushed 5bbb3ca59d71 to devinabox: http://hg.python.org/devinabox/rev/5bbb3ca59d71 changeset: 9:5bbb3ca59d71 user: Brett Cannon <brett(a)python.org> date: Fri Feb 25 17:44:56 2011 -0800 summary: Add a script which will build CPython. files: build_cpython.py diff --git a/build_cpython.py b/build_cpython.py new file mode 100644 --- /dev/null +++ b/build_cpython.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python +"""Build CPython""" +import multiprocessing +import os +import subprocess +import sys + +if sys.platform == 'win32': + print("See the devguide's Getting Set Up guide for building under Windows") + +directory = 'cpython' +cwd = os.getcwd() +os.chdir(directory) +try: + if os.path.isfile('Makefile'): + print('Makefile already exists; skipping ./configure') + else: + subprocess.check_call(['./configure', '--prefix=/dev/null', + '--with-pydebug']) + make_cmd = ['make', '-s', '-j', str(multiprocessing.cpu_count())] + subprocess.call(make_cmd) +finally: + os.chdir(cwd) -- Repository URL: http://hg.python.org/devinabox

1 0

r88682 - in python/branches/py3k: Doc/library/_thread.rst Lib/test/test_threading.py Misc/NEWS Modules/_threadmodule.c
by antoine.pitrou Feb. 28, 2011

Feb. 28, 2011

Author: antoine.pitrou Date: Mon Feb 28 23:03:34 2011 New Revision: 88682 Log: Issue #11140: Lock.release() now raises a RuntimeError when attempting to release an unacquired lock, as claimed in the threading documentation. The _thread.error exception is now an alias of RuntimeError. Modified: python/branches/py3k/Doc/library/_thread.rst python/branches/py3k/Lib/test/test_threading.py python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/_threadmodule.c Modified: python/branches/py3k/Doc/library/_thread.rst ============================================================================== --- python/branches/py3k/Doc/library/_thread.rst (original) +++ python/branches/py3k/Doc/library/_thread.rst Mon Feb 28 23:03:34 2011 @@ -35,6 +35,9 @@ Raised on thread-specific errors. + .. versionchanged:: 3.3 + This is now a synonym of the built-in :exc:`RuntimeError`. + .. data:: LockType Modified: python/branches/py3k/Lib/test/test_threading.py ============================================================================== --- python/branches/py3k/Lib/test/test_threading.py (original) +++ python/branches/py3k/Lib/test/test_threading.py Mon Feb 28 23:03:34 2011 @@ -685,6 +685,10 @@ thread.start() self.assertRaises(RuntimeError, setattr, thread, "daemon", True) + def test_releasing_unacquired_lock(self): + lock = threading.Lock() + self.assertRaises(RuntimeError, lock.release) + class LockTests(lock_tests.LockTests): locktype = staticmethod(threading.Lock) Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Feb 28 23:03:34 2011 @@ -35,6 +35,10 @@ Library ------- +- Issue #11140: Lock.release() now raises a RuntimeError when attempting + to release an unacquired lock, as claimed in the threading documentation. + The _thread.error exception is now an alias of RuntimeError. + - Issue 8594: ftplib now provides a source_address parameter to specify which (address, port) to bind to before connecting. Modified: python/branches/py3k/Modules/_threadmodule.c ============================================================================== --- python/branches/py3k/Modules/_threadmodule.c (original) +++ python/branches/py3k/Modules/_threadmodule.c Mon Feb 28 23:03:34 2011 @@ -1308,7 +1308,9 @@ /* Add a symbolic constant */ d = PyModule_GetDict(m); - ThreadError = PyErr_NewException("_thread.error", NULL, NULL); + ThreadError = PyExc_RuntimeError; + Py_INCREF(ThreadError); + PyDict_SetItemString(d, "error", ThreadError); Locktype.tp_doc = lock_doc; Py_INCREF(&Locktype);

1 0

r88681 - peps/trunk/pep-0385.txt
by antoine.pitrou Feb. 28, 2011

Feb. 28, 2011

Author: antoine.pitrou Date: Mon Feb 28 22:05:27 2011 New Revision: 88681 Log: Plain English Modified: peps/trunk/pep-0385.txt Modified: peps/trunk/pep-0385.txt ============================================================================== --- peps/trunk/pep-0385.txt (original) +++ peps/trunk/pep-0385.txt Mon Feb 28 22:05:27 2011 @@ -265,7 +265,7 @@ Mercurial, as well as a couple additional ones: * check branch heads: a hook to reject pushes which create a new head on - an existing branch. The pusher then has to merge the superfetatory heads + an existing branch. The pusher then has to merge the excess heads and try pushing again. * check branches: a hook to reject all changesets not on an allowed named

1 0

devguide (hg_transition): Add section about graphlog.
by georg.brandl Feb. 28, 2011

Feb. 28, 2011

georg.brandl pushed c7d1d29b0a3b to devguide: http://hg.python.org/devguide/rev/c7d1d29b0a3b changeset: 349:c7d1d29b0a3b branch: hg_transition tag: tip user: Georg Brandl <georg(a)python.org> date: Mon Feb 28 21:02:00 2011 +0100 summary: Add section about graphlog. files: faq.rst diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -456,6 +456,22 @@ hg log -vp -r <revision number> +How can I see the changeset graph in my repository? +--------------------------------------------------- + +In Mercurial repositories, changesets don't form a simple list, but rather +a graph: every changeset has one or two parents (it's called a merge changeset +in the latter case), and can have any number of children. + +The graphlog_ extension is very useful for examining the structure of the +changeset graph. It is bundled with Mercurial. + +Graphical tools, such as TortoiseHG, will display the changeset graph +by default. + +.. _graphlog: http://mercurial.selenic.com/wiki/GraphlogExtension + + How do I undo the changes made in a recent commit? ------------------------------------------------------------------------------- -- Repository URL: http://hg.python.org/devguide

1 0

devguide (hg_transition): Explain how to obtain a patch
by antoine.pitrou Feb. 28, 2011

Feb. 28, 2011

antoine.pitrou pushed 2d5e1a5058a3 to devguide: http://hg.python.org/devguide/rev/2d5e1a5058a3 changeset: 348:2d5e1a5058a3 branch: hg_transition tag: tip user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Feb 28 20:52:28 2011 +0100 summary: Explain how to obtain a patch files: committing.rst diff --git a/committing.rst b/committing.rst --- a/committing.rst +++ b/committing.rst @@ -286,3 +286,21 @@ connections, we could offer a way for people to make a remote-to-remote clone (like SVN allows creating branches by remote copying). hg currently doesn't support that. + + +Uploading a patch for review +'''''''''''''''''''''''''''' + +In this scheme, your work will probably consist of many commits (some of +them merges). If you want to upload a patch for review somewhere, you need +a single agregate patch. This is where having a dedicated named branch +``mywork`` gets handy. + +First ensure that you have pulled *and merged* all changes from the main +repository, as explained above. Then, assuming your :ref:`currently checked +out branch <hg-current-branch>` is still ``mywork``, simply do:: + + $ hg diff -r default > mywork.patch + +This will write to ``mywork.patch`` all the changes between ``default`` and +``mywork``. -- Repository URL: http://hg.python.org/devguide

1 0

devguide (hg_transition): Add a section explaining how to do long-term development of features
by antoine.pitrou Feb. 28, 2011

Feb. 28, 2011

antoine.pitrou pushed 766105be37f9 to devguide: http://hg.python.org/devguide/rev/766105be37f9 changeset: 347:766105be37f9 branch: hg_transition user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Feb 28 20:47:22 2011 +0100 summary: Add a section explaining how to do long-term development of features in a public repository. files: committing.rst diff --git a/committing.rst b/committing.rst --- a/committing.rst +++ b/committing.rst @@ -217,8 +217,72 @@ .. _transplant extension: http://mercurial.selenic.com/wiki/TransplantExtension - .. seealso:: `Merging work <http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html>`_, in `Mercurial: The Definitive Guide <http://hgbook.red-bean.com/>`_. + + +Long-term development of features +--------------------------------- + +If you want to work on a feature long-term (perhaps you're implementing a +PEP, or even removing the GIL), you will want to publish your work somewhere. +We then recommend that you maintain it in a dedicated repository. + +First create a public (empty) repository on hg.python.org:: + + $ hg init ssh://hg@hg.python.org/features/mywork + +And do a local clone of that repository on your disk:: + + $ hg clone ssh://hg@hg.python.org/features/mywork + $ cd mywork + +There, pull all the contents from the main repository, either from a local +clone:: + + $ hg pull ../cpython + $ hg update + +or directly from the network (which is of course slower):: + + $ hg pull http://hg.python.org/cpython + $ hg update + +It is recommended that you create a new named branch for your work, so as +to easily track changes. That named branch will exist in your feature +repository, but not in the main repository:: + + $ hg branch mywork + $ hg commit -m "Creating branch mywork" + +You can now work on your feature, commit changes as you will, and push them +when desired:: + + $ hg push + +When you push them, they will land in the public repository at +``ssh://hg@hg.python.org/features/mywork`` (or +``http://hg.python.org/features/mywork`` for the read-only URL). + +When you want to synchronize your changes, you can pull from the main +repository:: + + $ hg pull ../cpython + +or from the network:: + + $ hg pull http://hg.python.org/cpython + +and merge all new changes from branch ``default`` to branch ``mywork``:: + + $ hg branch + mywork + $ hg merge default + + +.. XXX: since the initial "hg push" can be quite long on asymmetric + connections, we could offer a way for people to make a remote-to-remote + clone (like SVN allows creating branches by remote copying). + hg currently doesn't support that. -- Repository URL: http://hg.python.org/devguide

1 0

r88680 - python/branches/py3k/Lib/test/test_os.py
by giampaolo.rodola Feb. 28, 2011

Feb. 28, 2011

Author: giampaolo.rodola Date: Mon Feb 28 20:27:16 2011 New Revision: 88680 Log: Issue 11348: skip os.setpriority() test if current nice level is >= 19. Modified: python/branches/py3k/Lib/test/test_os.py Modified: python/branches/py3k/Lib/test/test_os.py ============================================================================== --- python/branches/py3k/Lib/test/test_os.py (original) +++ python/branches/py3k/Lib/test/test_os.py Mon Feb 28 20:27:16 2011 @@ -1274,10 +1274,16 @@ """Tests for os.getpriority() and os.setpriority().""" def test_set_get_priority(self): + base = os.getpriority(os.PRIO_PROCESS, os.getpid()) os.setpriority(os.PRIO_PROCESS, os.getpid(), base + 1) try: - self.assertEqual(os.getpriority(os.PRIO_PROCESS, os.getpid()), base + 1) + new_prio = os.getpriority(os.PRIO_PROCESS, os.getpid()) + if base >= 19 and new_prio <= 19: + raise unittest.SkipTest( + "unable to reliably test setpriority at current nice level of %s" % base) + else: + self.assertEqual(new_prio, base + 1) finally: try: os.setpriority(os.PRIO_PROCESS, os.getpid(), base)

1 0

r88679 - in python/branches/py3k: Doc/library/ftplib.rst Lib/ftplib.py Lib/test/test_ftplib.py Misc/NEWS
by giampaolo.rodola Feb. 28, 2011

Feb. 28, 2011

Author: giampaolo.rodola Date: Mon Feb 28 20:19:51 2011 New Revision: 88679 Log: Fix issue 8594: adds a source_address parameter to ftplib module. Modified: python/branches/py3k/Doc/library/ftplib.rst python/branches/py3k/Lib/ftplib.py python/branches/py3k/Lib/test/test_ftplib.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/ftplib.rst ============================================================================== --- python/branches/py3k/Doc/library/ftplib.rst (original) +++ python/branches/py3k/Doc/library/ftplib.rst Mon Feb 28 20:19:51 2011 @@ -40,7 +40,7 @@ The module defines the following items: -.. class:: FTP(host='', user='', passwd='', acct=''[, timeout]) +.. class:: FTP(host='', user='', passwd='', acct='', timeout=None, source_address=None) Return a new instance of the :class:`FTP` class. When *host* is given, the method call ``connect(host)`` is made. When *user* is given, additionally @@ -48,7 +48,8 @@ *acct* default to the empty string when not given). The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if is not specified, the global default timeout setting - will be used). + will be used). *source_address* is a 2-tuple ``(host, port)`` for the socket + to bind to as its source address before connecting. :class:`FTP` class supports the :keyword:`with` statement. Here is a sample on how using it: @@ -68,8 +69,11 @@ .. versionchanged:: 3.2 Support for the :keyword:`with` statement was added. + .. versionchanged:: 3.3 + *source_address* parameter was added. -.. class:: FTP_TLS(host='', user='', passwd='', acct='', [keyfile[, certfile[, context[, timeout]]]]) + +.. class:: FTP_TLS(host='', user='', passwd='', acct='', keyfile=None, certfile=None, context=None, timeout=None, source_address=None) A :class:`FTP` subclass which adds TLS support to FTP as described in :rfc:`4217`. @@ -80,10 +84,15 @@ private key and certificate chain file name for the SSL connection. *context* parameter is a :class:`ssl.SSLContext` object which allows bundling SSL configuration options, certificates and private keys into a - single (potentially long-lived) structure. + single (potentially long-lived) structure. *source_address* is a 2-tuple + ``(host, port)`` for the socket to bind to as its source address before + connecting. .. versionadded:: 3.2 + .. versionchanged:: 3.3 + *source_address* parameter was added. + Here's a sample session using the :class:`FTP_TLS` class: >>> from ftplib import FTP_TLS @@ -174,7 +183,7 @@ debugging output, logging each line sent and received on the control connection. -.. method:: FTP.connect(host='', port=0[, timeout]) +.. method:: FTP.connect(host='', port=0, timeout=None, source_address=None) Connect to the given host and port. The default port number is ``21``, as specified by the FTP protocol specification. It is rarely needed to specify a @@ -182,10 +191,14 @@ instance; it should not be called at all if a host was given when the instance was created. All other methods can only be used after a connection has been made. - The optional *timeout* parameter specifies a timeout in seconds for the connection attempt. If no *timeout* is passed, the global default timeout setting will be used. + *source_address* is a 2-tuple ``(host, port)`` for the socket to bind to as + its source address before connecting. + + .. versionchanged:: 3.3 + *source_address* parameter was added. .. method:: FTP.getwelcome() Modified: python/branches/py3k/Lib/ftplib.py ============================================================================== --- python/branches/py3k/Lib/ftplib.py (original) +++ python/branches/py3k/Lib/ftplib.py Mon Feb 28 20:19:51 2011 @@ -107,7 +107,8 @@ # Optional arguments are host (for connect()), # and user, passwd, acct (for login()) def __init__(self, host='', user='', passwd='', acct='', - timeout=_GLOBAL_DEFAULT_TIMEOUT): + timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=None): + self.source_address = source_address self.timeout = timeout if host: self.connect(host) @@ -128,10 +129,12 @@ if self.sock is not None: self.close() - def connect(self, host='', port=0, timeout=-999): + def connect(self, host='', port=0, timeout=-999, source_address=None): '''Connect to host. Arguments are: - host: hostname to connect to (string, default previous host) - port: port to connect to (integer, default previous port) + - source_address: a 2-tuple (host, port) for the socket to bind + to as its source address before connecting. ''' if host != '': self.host = host @@ -139,7 +142,10 @@ self.port = port if timeout != -999: self.timeout = timeout - self.sock = socket.create_connection((self.host, self.port), self.timeout) + if source_address is not None: + self.source_address = source_address + self.sock = socket.create_connection((self.host, self.port), self.timeout, + source_address=self.source_address) self.af = self.sock.family self.file = self.sock.makefile('r', encoding=self.encoding) self.welcome = self.getresp() @@ -334,7 +340,8 @@ size = None if self.passiveserver: host, port = self.makepasv() - conn = socket.create_connection((host, port), self.timeout) + conn = socket.create_connection((host, port), self.timeout, + source_address=self.source_address) if rest is not None: self.sendcmd("REST %s" % rest) resp = self.sendcmd(cmd) @@ -637,7 +644,7 @@ def __init__(self, host='', user='', passwd='', acct='', keyfile=None, certfile=None, context=None, - timeout=_GLOBAL_DEFAULT_TIMEOUT): + timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=None): if context is not None and keyfile is not None: raise ValueError("context and keyfile arguments are mutually " "exclusive") @@ -648,7 +655,7 @@ self.certfile = certfile self.context = context self._prot_p = False - FTP.__init__(self, host, user, passwd, acct, timeout) + FTP.__init__(self, host, user, passwd, acct, timeout, source_address) def login(self, user='', passwd='', acct='', secure=True): if secure and not isinstance(self.sock, ssl.SSLSocket): Modified: python/branches/py3k/Lib/test/test_ftplib.py ============================================================================== --- python/branches/py3k/Lib/test/test_ftplib.py (original) +++ python/branches/py3k/Lib/test/test_ftplib.py Mon Feb 28 20:19:51 2011 @@ -608,6 +608,20 @@ self.assertEqual(self.server.handler_instance.last_received_cmd, 'quit') self.assertFalse(is_client_connected()) + def test_source_address(self): + self.client.quit() + port = support.find_unused_port() + self.client.connect(self.server.host, self.server.port, + source_address=(HOST, port)) + self.assertEqual(self.client.sock.getsockname()[1], port) + self.client.quit() + + def test_source_address_passive_connection(self): + port = support.find_unused_port() + self.client.source_address = (HOST, port) + sock = self.client.transfercmd('list') + self.assertEqual(sock.getsockname()[1], port) + def test_parse257(self): self.assertEqual(ftplib.parse257('257 "/foo/bar"'), '/foo/bar') self.assertEqual(ftplib.parse257('257 "/foo/bar" created'), '/foo/bar') Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Feb 28 20:19:51 2011 @@ -35,6 +35,9 @@ Library ------- +- Issue 8594: ftplib now provides a source_address parameter to specify which + (address, port) to bind to before connecting. + - Issue #11326: Add the missing connect_ex() implementation for SSL sockets, and make it work for non-blocking connects.

1 0