Mailman 3 January 2007 - Python-checkins

r53545 - python/trunk/Doc/lib/libmailbox.tex
by andrew.kuchling Jan. 24, 2007

Jan. 24, 2007

Author: andrew.kuchling Date: Wed Jan 24 21:06:41 2007 New Revision: 53545 Modified: python/trunk/Doc/lib/libmailbox.tex Log: Strengthen warning about using lock() Modified: python/trunk/Doc/lib/libmailbox.tex ============================================================================== --- python/trunk/Doc/lib/libmailbox.tex (original) +++ python/trunk/Doc/lib/libmailbox.tex Wed Jan 24 21:06:41 2007 @@ -58,14 +58,18 @@ \exception{KeyError} exception if the corresponding message is subsequently removed. -Be very cautious when modifying mailboxes that might also be changed -by some other process. The safest mailbox format to use for such -tasks is Maildir; try to avoid using single-file formats such as mbox -for concurrent writing. If you're modifying a mailbox, no matter what -the format, you must lock it by calling the \method{lock()} and -\method{unlock()} methods before making any changes. Failing to lock -the mailbox runs the risk of losing data if some other process makes -changes to the mailbox while your Python code is running. +\begin{notice}[warning] +Be very cautious when modifying mailboxes that might be +simultaneously changed by some other process. The safest mailbox +format to use for such tasks is Maildir; try to avoid using +single-file formats such as mbox for concurrent writing. If you're +modifying a mailbox, you +\emph{must} lock it by calling the \method{lock()} and +\method{unlock()} methods \emph{before} reading any messages in the file +or making any changes by adding or deleting a message. Failing to +lock the mailbox runs the risk of losing messages or corrupting the entire +mailbox. +\end{notice} \class{Mailbox} instances have the following methods:

1 0

r53544 - tracker/instances/python-dev/html/issue.item.html
by erik.forsberg Jan. 24, 2007

Jan. 24, 2007

Author: erik.forsberg Date: Wed Jan 24 20:07:08 2007 New Revision: 53544 Modified: tracker/instances/python-dev/html/issue.item.html Log: Make the keywords menu 3 items high, which hopefully is a quick hack good enough to resolve http://psf.upfronthosting.co.za/roundup/meta/issue71 Modified: tracker/instances/python-dev/html/issue.item.html ============================================================================== --- tracker/instances/python-dev/html/issue.item.html (original) +++ tracker/instances/python-dev/html/issue.item.html Wed Jan 24 20:07:08 2007 @@ -141,7 +141,7 @@ </th> <td tal:content="structure context/priority/menu">priority</td> <th i18n:translate="">Keywords:</th> - <td tal:content="structure context/keywords/menu">keywords</td> + <td tal:content="structure python:context['keywords'].menu(height=3)">keywords</td> </tr>

1 0

r53543 - in python/branches/bcannon-objcap: BRANCHNEWS Lib/codecs.py Python/pythonrun.c
by brett.cannon Jan. 24, 2007

Jan. 24, 2007

Author: brett.cannon Date: Wed Jan 24 19:49:35 2007 New Revision: 53543 Modified: python/branches/bcannon-objcap/BRANCHNEWS python/branches/bcannon-objcap/Lib/codecs.py python/branches/bcannon-objcap/Python/pythonrun.c Log: Make codecs module safe by changing sys import to only import exactly what it needs (byteorder). This prevents a reference to the sys module from slipping past. The warnings module is still unsafe as it uses sys._getframe. Modified: python/branches/bcannon-objcap/BRANCHNEWS ============================================================================== --- python/branches/bcannon-objcap/BRANCHNEWS (original) +++ python/branches/bcannon-objcap/BRANCHNEWS Wed Jan 24 19:49:35 2007 @@ -51,4 +51,7 @@ Library ------- +* Change the codecs module so that it does not import the entire sys module and + thus hold a reference to it. + * rev. 53333: External definition of importlib (from the sandbox) added. Modified: python/branches/bcannon-objcap/Lib/codecs.py ============================================================================== --- python/branches/bcannon-objcap/Lib/codecs.py (original) +++ python/branches/bcannon-objcap/Lib/codecs.py Wed Jan 24 19:49:35 2007 @@ -7,7 +7,8 @@ """#" -import __builtin__, sys +import __builtin__ +from sys import byteorder ### Registry and builtin stateless codec functions @@ -47,7 +48,7 @@ # UTF-32, big endian BOM_UTF32_BE = '\x00\x00\xfe\xff' -if sys.byteorder == 'little': +if byteorder == 'little': # UTF-16, native endianness BOM = BOM_UTF16 = BOM_UTF16_LE @@ -1022,13 +1023,3 @@ _false = 0 if _false: import encodings - -### Tests - -if __name__ == '__main__': - - # Make stdout translate Latin-1 output into UTF-8 output - sys.stdout = EncodedFile(sys.stdout, 'latin-1', 'utf-8') - - # Have stdin translate Latin-1 input into UTF-8 input - sys.stdin = EncodedFile(sys.stdin, 'utf-8', 'latin-1') Modified: python/branches/bcannon-objcap/Python/pythonrun.c ============================================================================== --- python/branches/bcannon-objcap/Python/pythonrun.c (original) +++ python/branches/bcannon-objcap/Python/pythonrun.c Wed Jan 24 19:49:35 2007 @@ -344,7 +344,29 @@ PyDict_GetItemString(interp->sysdict, "import_delegate")); - /* Clear out sys.modules (sans some key modules). */ + /* Clear out sys.modules. + Some modules must be kept around (at least for now; **XXX need to do + a security audit of each one!): + + * __builtin__ + Lose this and Python will not run. + * __main__ + Current scope of execution. + * exceptions + Safe to keep around. + * sys + Certain values set during Python initialization that are lost + when the module is deleted and then re-imported. + * encodings + Does dynamic import of encodings which requires globals() to + work; globals() fails when the module has been deleted. + * encodings.utf_8 + Many encodings use this. + * codecs + Incremental codecs fail. + * warnings + Warnings reset otherwise. + */ module_names_list = PyDict_Keys(interp->modules); module_count = PyList_GET_SIZE(module_names_list); for (x=0; x < module_count; x+=1) { @@ -355,7 +377,10 @@ (strcmp(module_name, "exceptions") != 0) && (strcmp(module_name, "__main__") != 0) && (strcmp(module_name, "sys") != 0) && - (strcmp(module_name, "encodings") != 0)) { + (strcmp(module_name, "encodings") != 0) && + (strcmp(module_name, "encodings.utf_8") != 0) && + (strcmp(module_name, "codecs") != 0) && + (strcmp(module_name, "warnings") != 0)) { PyDict_DelItemString(interp->modules, module_name); } }

1 0

r53542 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/package_index.py
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 16:42:26 2007 New Revision: 53542 Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt sandbox/branches/setuptools-0.6/setuptools/package_index.py Log: EasyInstall no longer aborts the installation process if a URL it wants to retrieve can't be downloaded, unless the URL is an actual package download. Instead, it issues a warning and tries to keep going. (backport from trunk) Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt ============================================================================== --- sandbox/branches/setuptools-0.6/EasyInstall.txt (original) +++ sandbox/branches/setuptools-0.6/EasyInstall.txt Wed Jan 24 16:42:26 2007 @@ -1194,6 +1194,11 @@ Release Notes/Change History ============================ +0.6c6 + * EasyInstall no longer aborts the installation process if a URL it wants to + retrieve can't be downloaded, unless the URL is an actual package download. + Instead, it issues a warning and tries to keep going. + 0.6c5 * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg is installed unzipped. Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/package_index.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/package_index.py Wed Jan 24 16:42:26 2007 @@ -166,7 +166,6 @@ """Evaluate a URL as a possible download, and maybe retrieve it""" if url in self.scanned_urls and not retrieve: return - self.scanned_urls[url] = True if not URL_SCHEME(url): self.process_filename(url) @@ -187,7 +186,8 @@ return self.info("Reading %s", url) - f = self.open_url(url) + f = self.open_url(url, "Download error: %s -- Some packages may not be found!") + if f is None: return self.fetched_urls[url] = self.fetched_urls[f.url] = True if 'html' not in f.headers.get('content-type', '').lower(): @@ -572,7 +572,7 @@ pass # no-op - def open_url(self, url): + def open_url(self, url, warning=None): if url.startswith('file:'): return local_open(url) try: @@ -580,7 +580,8 @@ except urllib2.HTTPError, v: return v except urllib2.URLError, v: - raise DistutilsError("Download error: %s" % v.reason) + if warning: self.warn(warning, v.reason) + else: raise DistutilsError("Download error: %s" % v.reason) def _download_url(self, scheme, url, tmpdir): # Determine download filename @@ -612,7 +613,6 @@ self.process_url(url, True) - def _attempt_download(self, url, filename): headers = self._download_to(url, filename) if 'html' in headers['content-type'].lower():

1 0

r53541 - sandbox/trunk/setuptools/setuptools/package_index.py
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 16:39:00 2007 New Revision: 53541 Modified: sandbox/trunk/setuptools/setuptools/package_index.py Log: If a page can't be spidered, warn and ignore rather than aborting. Modified: sandbox/trunk/setuptools/setuptools/package_index.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/package_index.py (original) +++ sandbox/trunk/setuptools/setuptools/package_index.py Wed Jan 24 16:39:00 2007 @@ -166,7 +166,6 @@ """Evaluate a URL as a possible download, and maybe retrieve it""" if url in self.scanned_urls and not retrieve: return - self.scanned_urls[url] = True if not URL_SCHEME(url): self.process_filename(url) @@ -187,7 +186,8 @@ return self.info("Reading %s", url) - f = self.open_url(url) + f = self.open_url(url, "Download error: %s -- Some packages may not be found!") + if f is None: return self.fetched_urls[url] = self.fetched_urls[f.url] = True if 'html' not in f.headers.get('content-type', '').lower(): @@ -572,7 +572,7 @@ pass # no-op - def open_url(self, url): + def open_url(self, url, warning=None): if url.startswith('file:'): return local_open(url) try: @@ -580,7 +580,8 @@ except urllib2.HTTPError, v: return v except urllib2.URLError, v: - raise DistutilsError("Download error: %s" % v.reason) + if warning: self.warn(warning, v.reason) + else: raise DistutilsError("Download error: %s" % v.reason) def _download_url(self, scheme, url, tmpdir): # Determine download filename @@ -612,7 +613,6 @@ self.process_url(url, True) - def _attempt_download(self, url, filename): headers = self._download_to(url, filename) if 'html' in headers['content-type'].lower():

1 0

r53540 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/bdist_egg.py
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 16:26:00 2007 New Revision: 53540 Modified: sandbox/branches/setuptools-0.6/setuptools.txt sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py Log: Fix "eggsecutables" (such as setuptools' own egg) only being runnable with bash-compatible shells. (backport from trunk) Modified: sandbox/branches/setuptools-0.6/setuptools.txt ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools.txt (original) +++ sandbox/branches/setuptools-0.6/setuptools.txt Wed Jan 24 16:26:00 2007 @@ -2603,6 +2603,9 @@ 0.6c6 * Fix not building binary RPMs correctly. + * Fix "eggsecutables" (such as setuptools' own egg) only being runnable with + bash-compatible shells. + 0.6c5 * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg`` packages under Python versions less than 2.5. Modified: sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py Wed Jan 24 16:26:00 2007 @@ -305,7 +305,7 @@ header = ( "#!/bin/sh\n" - 'if [[ `basename $0` = "%(basename)s" ]]\n' + 'if [ `basename $0` = "%(basename)s" ]\n' 'then exec python%(pyver)s -c "' "import sys, os; sys.path.insert(0, os.path.abspath('$0')); " "from %(pkg)s import %(base)s; sys.exit(%(full)s())"

1 0

r53539 - sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 16:22:12 2007 New Revision: 53539 Modified: sandbox/trunk/setuptools/setuptools/command/bdist_egg.py Log: Fix "bashism" in eggsecutable header. Modified: sandbox/trunk/setuptools/setuptools/command/bdist_egg.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/command/bdist_egg.py (original) +++ sandbox/trunk/setuptools/setuptools/command/bdist_egg.py Wed Jan 24 16:22:12 2007 @@ -305,7 +305,7 @@ header = ( "#!/bin/sh\n" - 'if [[ `basename $0` = "%(basename)s" ]]\n' + 'if [ `basename $0` = "%(basename)s" ]\n' 'then exec python%(pyver)s -c "' "import sys, os; sys.path.insert(0, os.path.abspath('$0')); " "from %(pkg)s import %(base)s; sys.exit(%(full)s())"

1 0

r53538 - sandbox/trunk/setuptools/README.txt
by phillip.eby Jan. 24, 2007

Jan. 24, 2007

Author: phillip.eby Date: Wed Jan 24 16:21:48 2007 New Revision: 53538 Modified: sandbox/trunk/setuptools/README.txt Log: Incorporate README fix from 0.6 branch. Modified: sandbox/trunk/setuptools/README.txt ============================================================================== --- sandbox/trunk/setuptools/README.txt (original) +++ sandbox/trunk/setuptools/README.txt Wed Jan 24 16:21:48 2007 @@ -92,6 +92,14 @@ .. _the project's home page in the Python Cheese Shop: http://cheeseshop.python.org/pypi/setuptools +In addition to the PyPI downloads, the development version of ``setuptools`` +is available from the `Python SVN sandbox`_, and in-development versions of the +`0.6 branch`_ are available as well. + +.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setupto… + +.. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev + -------------------------------- Using Setuptools and EasyInstall --------------------------------

1 0

r53537 - tracker/instances/python-dev/html/user.index.html
by erik.forsberg Jan. 24, 2007

Jan. 24, 2007

Author: erik.forsberg Date: Wed Jan 24 07:32:49 2007 New Revision: 53537 Modified: tracker/instances/python-dev/html/user.index.html Log: Added simple search interface for users. Should close http://psf.upfronthosting.co.za/roundup/meta/issue19. Modified: tracker/instances/python-dev/html/user.index.html ============================================================================== --- tracker/instances/python-dev/html/user.index.html (original) +++ tracker/instances/python-dev/html/user.index.html Wed Jan 24 07:32:49 2007 @@ -13,6 +13,35 @@ and request.user.hasRole('Anonymous')" i18n:translate="">Please login with your username and password.</span> +<form tal:condition="context/is_view_ok" method="get" name="itemSynopsis" + tal:attributes="action request/classname"> + +<table class="form" tal:define=" + search_input templates/page/macros/search_input;"> + + <tr><th class="header" colspan="5">Search for users</th></tr> + <tr> + <th class="header">Username</th> + <td tal:define="name string:username"> + <input tal:attributes="value python:request.form.getvalue(name) or nothing; + name name; + id name"/> + </td> + <th class="header">Realname</th> + <td tal:define="name string:realname"> + <input tal:attributes="value python:request.form.getvalue(name) or nothing; + name name; + id name"/> + </td> + + <td><input class="form-small" type="submit" value="Search" i18n:attributes="value"/></td> + </tr> + +</table> + <input type="hidden" name="@action" value="search"/> +</form> + + <table width="100%" tal:condition="context/is_view_ok" class="list" tal:define="batch request/batch"> <tr>

1 0

r53536 - in python/trunk/Lib/test: output/test_popen test_popen.py
by walter.doerwald Jan. 24, 2007

Jan. 24, 2007

Author: walter.doerwald Date: Wed Jan 24 01:42:19 2007 New Revision: 53536 Removed: python/trunk/Lib/test/output/test_popen Modified: python/trunk/Lib/test/test_popen.py Log: Port test_popen.py to unittest. Deleted: /python/trunk/Lib/test/output/test_popen ============================================================================== --- /python/trunk/Lib/test/output/test_popen Wed Jan 24 01:42:19 2007 +++ (empty file) @@ -1,3 +0,0 @@ -test_popen -Test popen: -popen seemed to process the command-line correctly Modified: python/trunk/Lib/test/test_popen.py ============================================================================== --- python/trunk/Lib/test/test_popen.py (original) +++ python/trunk/Lib/test/test_popen.py Wed Jan 24 01:42:19 2007 @@ -4,10 +4,9 @@ Particularly useful for platforms that fake popen. """ -import os -import sys -from test.test_support import TestSkipped, reap_children -from os import popen +import unittest +from test import test_support +import os, sys # Test that command-lines get down as we expect. # To do this we execute: @@ -17,24 +16,32 @@ python = sys.executable if ' ' in python: python = '"' + python + '"' # quote embedded space for cmdline -def _do_test_commandline(cmdline, expected): - cmd = '%s -c "import sys;print sys.argv" %s' % (python, cmdline) - data = popen(cmd).read() - got = eval(data)[1:] # strip off argv[0] - if got != expected: - print "Error in popen commandline handling." - print " executed '%s', expected '%r', but got '%r'" \ - % (cmdline, expected, got) - -def _test_commandline(): - _do_test_commandline("foo bar", ["foo", "bar"]) - _do_test_commandline('foo "spam and eggs" "silly walk"', ["foo", "spam and eggs", "silly walk"]) - _do_test_commandline('foo "a \\"quoted\\" arg" bar', ["foo", 'a "quoted" arg', "bar"]) - print "popen seemed to process the command-line correctly" - -def main(): - print "Test popen:" - _test_commandline() - reap_children() -main() +class PopenTest(unittest.TestCase): + def _do_test_commandline(self, cmdline, expected): + cmd = '%s -c "import sys;print sys.argv" %s' % (python, cmdline) + data = os.popen(cmd).read() + got = eval(data)[1:] # strip off argv[0] + self.assertEqual(got, expected) + + def test_popen(self): + self.assertRaises(TypeError, os.popen) + self._do_test_commandline( + "foo bar", + ["foo", "bar"] + ) + self._do_test_commandline( + 'foo "spam and eggs" "silly walk"', + ["foo", "spam and eggs", "silly walk"] + ) + self._do_test_commandline( + 'foo "a \\"quoted\\" arg" bar', + ["foo", 'a "quoted" arg', "bar"] + ) + test_support.reap_children() + +def test_main(): + test_support.run_unittest(PopenTest) + +if __name__ == "__main__": + test_main()

1 0