Mailman 3 May 2007 - Python-checkins

r55723 - python/branches/bcannon-objcap/Python/Python-ast.c
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Fri Jun 1 00:15:46 2007 New Revision: 55723 Modified: python/branches/bcannon-objcap/Python/Python-ast.c Log: SVN number update for AST. Modified: python/branches/bcannon-objcap/Python/Python-ast.c ============================================================================== --- python/branches/bcannon-objcap/Python/Python-ast.c (original) +++ python/branches/bcannon-objcap/Python/Python-ast.c Fri Jun 1 00:15:46 2007 @@ -2,7 +2,7 @@ /* - __version__ 43614. + __version__ 55591. This module must be committed separately after each AST grammar change; The __version__ number is set to the revision number of the commit @@ -2947,7 +2947,7 @@ if (PyDict_SetItemString(d, "AST", (PyObject*)AST_type) < 0) return; if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0) return; - if (PyModule_AddStringConstant(m, "__version__", "43614") < 0) + if (PyModule_AddStringConstant(m, "__version__", "55591") < 0) return; if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return; if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)

1 0

buildbot warnings in x86 XP trunk
by buildbot＠python.org May 31, 2007

May 31, 2007

The Buildbot has detected a new failure of x86 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520XP%2520trunk/builds/474 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon,neal.norwitz Build had warnings: warnings failed slave lost sincerely, -The Buildbot

1 0

r55722 - peps/trunk/pep-0004.txt peps/trunk/pep-0361.txt
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Thu May 31 22:01:43 2007 New Revision: 55722 Modified: peps/trunk/pep-0004.txt peps/trunk/pep-0361.txt Log: Update PEPs to reflect that cfmfile now raises a DeprecationWarning. Modified: peps/trunk/pep-0004.txt ============================================================================== --- peps/trunk/pep-0004.txt (original) +++ peps/trunk/pep-0004.txt Thu May 31 22:01:43 2007 @@ -84,7 +84,7 @@ The following modules currently lack a DeprecationWarning: - rfc822, mimetools, multifile, cfmfile + rfc822, mimetools, multifile Deprecated modules @@ -212,7 +212,8 @@ Rationale: Unknown. Date: 15-May-2007 Documentation: Documented as deprecated as of Python 2.4, but - listing in this PEP was neglected. + listing in this PEP was neglected. A + DeprecationWarning was added in Python 2.6. Module name: macfs Rationale: Unknown. Modified: peps/trunk/pep-0361.txt ============================================================================== --- peps/trunk/pep-0361.txt (original) +++ peps/trunk/pep-0361.txt Thu May 31 22:01:43 2007 @@ -62,6 +62,7 @@ Deprecated modules and functions in the standard library: - buildtools + - cfmfile - commands.getstatus() - macostools.touched() - md5 @@ -132,8 +133,7 @@ - rfc822 - mimetools - multifile - - cfmfile - - compiler package + - compiler package (or a Py3K warning instead?) - warnings module implemented in C * Convert Parser/*.c to use warnings module rather than printf

1 0

r55721 - in python/trunk: Lib/plat-mac/cfmfile.py Misc/NEWS
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Thu May 31 22:01:11 2007 New Revision: 55721 Modified: python/trunk/Lib/plat-mac/cfmfile.py python/trunk/Misc/NEWS Log: Have cfmfile raise a DeprecationWarning as per PEP 4. Modified: python/trunk/Lib/plat-mac/cfmfile.py ============================================================================== --- python/trunk/Lib/plat-mac/cfmfile.py (original) +++ python/trunk/Lib/plat-mac/cfmfile.py Thu May 31 22:01:11 2007 @@ -11,6 +11,9 @@ import os import sys +import warnings +warnings.warn("the cfmfile module is deprecated", DeprecationWarning, 2) + DEBUG = 0 error = "cfm.error" Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 31 22:01:11 2007 @@ -909,6 +909,8 @@ Mac --- +- cfmfile now raises a DeprecationWarning. + - buildtools now raises a DeprecationWarning. - Removed the macfs module. It had been deprecated since Python 2.5. This

1 0

r55720 - peps/trunk/pep-0004.txt peps/trunk/pep-0361.txt
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Thu May 31 21:41:41 2007 New Revision: 55720 Modified: peps/trunk/pep-0004.txt peps/trunk/pep-0361.txt Log: Update PEPs about buildtools raising a DeprecationWarning. Modified: peps/trunk/pep-0004.txt ============================================================================== --- peps/trunk/pep-0004.txt (original) +++ peps/trunk/pep-0004.txt Thu May 31 21:41:41 2007 @@ -84,7 +84,7 @@ The following modules currently lack a DeprecationWarning: - rfc822, mimetools, multifile, buildtools, cfmfile + rfc822, mimetools, multifile, cfmfile Deprecated modules @@ -205,7 +205,8 @@ Rationale: Unknown. Date: 15-May-2007 Documentation: Documented as deprecated as of Python 2.3, but - listing in this PEP was neglected. + listing in this PEP was neglected. Raised a + DeprecationWarning as of Python 2.6. Module name: cfmfile Rationale: Unknown. Modified: peps/trunk/pep-0361.txt ============================================================================== --- peps/trunk/pep-0361.txt (original) +++ peps/trunk/pep-0361.txt Thu May 31 21:41:41 2007 @@ -61,6 +61,7 @@ Deprecated modules and functions in the standard library: + - buildtools - commands.getstatus() - macostools.touched() - md5 @@ -131,7 +132,6 @@ - rfc822 - mimetools - multifile - - buildtools - cfmfile - compiler package

1 0

r55719 - in python/trunk: Lib/plat-mac/buildtools.py Misc/NEWS
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Thu May 31 21:40:42 2007 New Revision: 55719 Modified: python/trunk/Lib/plat-mac/buildtools.py python/trunk/Misc/NEWS Log: Cause buildtools to raise a DeprecationWarning. Modified: python/trunk/Lib/plat-mac/buildtools.py ============================================================================== --- python/trunk/Lib/plat-mac/buildtools.py (original) +++ python/trunk/Lib/plat-mac/buildtools.py Thu May 31 21:40:42 2007 @@ -14,6 +14,9 @@ import EasyDialogs import shutil +import warnings +warnings.warn("the buildtools module is deprecated", DeprecationWarning, 2) + BuildError = "BuildError" Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 31 21:40:42 2007 @@ -909,6 +909,8 @@ Mac --- +- buildtools now raises a DeprecationWarning. + - Removed the macfs module. It had been deprecated since Python 2.5. This lead to the deprecation of macostools.touched() as it relied solely on macfs and was a no-op under OS X.

1 0

r55717 - peps/trunk/pep-0004.txt peps/trunk/pep-0361.txt
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Thu May 31 21:20:54 2007 New Revision: 55717 Modified: peps/trunk/pep-0004.txt peps/trunk/pep-0361.txt Log: Update PEPs to reflect the raising of a DeprecationWarning by the sha module. Modified: peps/trunk/pep-0004.txt ============================================================================== --- peps/trunk/pep-0004.txt (original) +++ peps/trunk/pep-0004.txt Thu May 31 21:20:54 2007 @@ -84,7 +84,7 @@ The following modules currently lack a DeprecationWarning: - rfc822, mimetools, multifile, sha, buildtools, cfmfile + rfc822, mimetools, multifile, buildtools, cfmfile Deprecated modules @@ -232,6 +232,7 @@ Date: 15-May-2007 Documentation: Documented as deprecated as of Python 2.5, but listing in this PEP was neglected. + DeprecationWarning added in Python 2.6. Module name: plat-freebsd2/IN and plat-freebsd3/IN Rationale: Platforms are obsolete (last released in 2000) Modified: peps/trunk/pep-0361.txt ============================================================================== --- peps/trunk/pep-0361.txt (original) +++ peps/trunk/pep-0361.txt Thu May 31 21:20:54 2007 @@ -69,6 +69,7 @@ - popen2, os.popen[234]() - posixfile - sets + - sha Modules removed from the standard library: @@ -130,7 +131,6 @@ - rfc822 - mimetools - multifile - - sha - buildtools - cfmfile - compiler package

1 0

r55716 - in python/trunk: Lib/sha.py Lib/test/test_hmac.py Lib/test/test_pep247.py Lib/test/test_sha.py Lib/uuid.py Misc/NEWS
by brett.cannon May 31, 2007

May 31, 2007

Author: brett.cannon Date: Thu May 31 21:20:00 2007 New Revision: 55716 Modified: python/trunk/Lib/sha.py python/trunk/Lib/test/test_hmac.py python/trunk/Lib/test/test_pep247.py python/trunk/Lib/test/test_sha.py python/trunk/Lib/uuid.py python/trunk/Misc/NEWS Log: Have the sha module raise a DeprecationWarning as specified in PEP 4. Modified: python/trunk/Lib/sha.py ============================================================================== --- python/trunk/Lib/sha.py (original) +++ python/trunk/Lib/sha.py Thu May 31 21:20:00 2007 @@ -3,6 +3,10 @@ # Copyright (C) 2005 Gregory P. Smith (greg(a)electricrain.com) # Licensed to PSF under a Contributor Agreement. +import warnings +warnings.warn("the sha module is deprecated; use the hashlib module instead", + DeprecationWarning, 2) + from hashlib import sha1 as sha new = sha Modified: python/trunk/Lib/test/test_hmac.py ============================================================================== --- python/trunk/Lib/test/test_hmac.py (original) +++ python/trunk/Lib/test/test_hmac.py Thu May 31 21:20:00 2007 @@ -1,5 +1,5 @@ import hmac -import sha +from hashlib import sha1 import unittest from test import test_support @@ -43,7 +43,7 @@ def test_sha_vectors(self): def shatest(key, data, digest): - h = hmac.HMAC(key, data, digestmod=sha) + h = hmac.HMAC(key, data, digestmod=sha1) self.assertEqual(h.hexdigest().upper(), digest.upper()) shatest(chr(0x0b) * 20, @@ -95,11 +95,11 @@ def test_withmodule(self): # Constructor call with text and digest module. - import sha + from hashlib import sha1 try: - h = hmac.HMAC("key", "", sha) + h = hmac.HMAC("key", "", sha1) except: - self.fail("Constructor call with sha module raised exception.") + self.fail("Constructor call with hashlib.sha1 raised exception.") class SanityTestCase(unittest.TestCase): Modified: python/trunk/Lib/test/test_pep247.py ============================================================================== --- python/trunk/Lib/test/test_pep247.py (original) +++ python/trunk/Lib/test/test_pep247.py Thu May 31 21:20:00 2007 @@ -6,6 +6,8 @@ import warnings warnings.filterwarnings("ignore", "the md5 module is deprecated.*", DeprecationWarning) +warnings.filterwarnings("ignore", "the sha module is deprecated.*", + DeprecationWarning) import md5, sha, hmac Modified: python/trunk/Lib/test/test_sha.py ============================================================================== --- python/trunk/Lib/test/test_sha.py (original) +++ python/trunk/Lib/test/test_sha.py Thu May 31 21:20:00 2007 @@ -4,6 +4,10 @@ # Publication 180-1, Secure Hash Standard, 1995 April 17 # http://www.itl.nist.gov/div897/pubs/fip180-1.htm +import warnings +warnings.filterwarnings("ignore", "the sha module is deprecated.*", + DeprecationWarning) + import sha import unittest from test import test_support Modified: python/trunk/Lib/uuid.py ============================================================================== --- python/trunk/Lib/uuid.py (original) +++ python/trunk/Lib/uuid.py Thu May 31 21:20:00 2007 @@ -529,8 +529,8 @@ def uuid5(namespace, name): """Generate a UUID from the SHA-1 hash of a namespace UUID and a name.""" - import sha - hash = sha.sha(namespace.bytes + name).digest() + from hashlib import sha1 + hash = sha1(namespace.bytes + name).digest() return UUID(bytes=hash[:16], version=5) # The following standard UUIDs are for use with uuid3() or uuid5(). Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 31 21:20:00 2007 @@ -220,6 +220,8 @@ Library ------- +- sha now raises a DeprecationWarning upon import. + - md5 now raises a DeprecationWarning upon import. - mimify now raises a DeprecationWarning upon import.

1 0

r55713 - in sandbox/branches/setuptools-0.6: ez_setup.py release.sh setup.py setuptools/__init__.py version.dat
by phillip.eby May 31, 2007

May 31, 2007

Author: phillip.eby Date: Thu May 31 19:48:28 2007 New Revision: 55713 Modified: sandbox/branches/setuptools-0.6/ez_setup.py sandbox/branches/setuptools-0.6/release.sh sandbox/branches/setuptools-0.6/setup.py sandbox/branches/setuptools-0.6/setuptools/__init__.py sandbox/branches/setuptools-0.6/version.dat Log: bump version Modified: sandbox/branches/setuptools-0.6/ez_setup.py ============================================================================== --- sandbox/branches/setuptools-0.6/ez_setup.py (original) +++ sandbox/branches/setuptools-0.6/ez_setup.py Thu May 31 19:48:28 2007 @@ -14,7 +14,7 @@ This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c6" +DEFAULT_VERSION = "0.6c7" DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { Modified: sandbox/branches/setuptools-0.6/release.sh ============================================================================== --- sandbox/branches/setuptools-0.6/release.sh (original) +++ sandbox/branches/setuptools-0.6/release.sh Thu May 31 19:48:28 2007 @@ -7,7 +7,7 @@ # If your initials aren't PJE, don't run it. :) # -export VERSION="0.6c6" +export VERSION="0.6c7" python2.3 setup.py -q release source --target-version=2.3 upload && \ python2.4 setup.py -q release binary --target-version=2.4 upload && \ Modified: sandbox/branches/setuptools-0.6/setup.py ============================================================================== --- sandbox/branches/setuptools-0.6/setup.py (original) +++ sandbox/branches/setuptools-0.6/setup.py Thu May 31 19:48:28 2007 @@ -7,7 +7,7 @@ execfile(convert_path('setuptools/command/__init__.py'), d) SETUP_COMMANDS = d['__all__'] -VERSION = "0.6c6" +VERSION = "0.6c7" from setuptools import setup, find_packages import sys Modified: sandbox/branches/setuptools-0.6/setuptools/__init__.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/__init__.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/__init__.py Thu May 31 19:48:28 2007 @@ -7,7 +7,7 @@ from distutils.util import convert_path import os.path -__version__ = '0.6c6' +__version__ = '0.6c7' __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'find_packages' Modified: sandbox/branches/setuptools-0.6/version.dat ============================================================================== --- sandbox/branches/setuptools-0.6/version.dat (original) +++ sandbox/branches/setuptools-0.6/version.dat Thu May 31 19:48:28 2007 @@ -1,6 +1,6 @@ [setuptools] status = 'release candidate' major = 0 -build = 6 +build = 7 minor = 6

1 0

r55712 - in sandbox/branches/setuptools-0.6: EasyInstall.txt pkg_resources.py pkg_resources.txt setuptools.txt setuptools/__init__.py setuptools/package_index.py
by phillip.eby May 31, 2007

May 31, 2007

Author: phillip.eby Date: Thu May 31 19:30:55 2007 New Revision: 55712 Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt sandbox/branches/setuptools-0.6/pkg_resources.py sandbox/branches/setuptools-0.6/pkg_resources.txt sandbox/branches/setuptools-0.6/setuptools.txt sandbox/branches/setuptools-0.6/setuptools/__init__.py sandbox/branches/setuptools-0.6/setuptools/package_index.py Log: Backport fixes and doc updates; prep for 0.6c6 release Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt ============================================================================== --- sandbox/branches/setuptools-0.6/EasyInstall.txt (original) +++ sandbox/branches/setuptools-0.6/EasyInstall.txt Thu May 31 19:30:55 2007 @@ -442,6 +442,19 @@ below, and also the section on the `Package Index "API"`_. +Password-Protected Sites +------------------------ + +If a site you want to download from is password-protected using HTTP "Basic" +authentication, you can specify your credentials in the URL, like so:: + + http://some_userid:some_password@some.example.com/some_path/ + +You can do this with both index page URLs and direct download URLs. As long +as any HTML pages read by easy_install use *relative* links to point to the +downloads, the same user ID and password will be used to do the downloading. + + Controlling Build Options ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1230,6 +1243,8 @@ * Added ``--local-snapshots-ok`` flag, to allow building eggs from projects installed using ``setup.py develop``. + + * Fixed not HTML-decoding URLs scraped from web pages 0.6c5 * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg Modified: sandbox/branches/setuptools-0.6/pkg_resources.py ============================================================================== --- sandbox/branches/setuptools-0.6/pkg_resources.py (original) +++ sandbox/branches/setuptools-0.6/pkg_resources.py Thu May 31 19:30:55 2007 @@ -1052,7 +1052,7 @@ dirname = '' for key in keys: if key in os.environ: - dirname = os.path.join(os.environ[key]) + dirname = os.path.join(dirname, os.environ[key]) else: break else: Modified: sandbox/branches/setuptools-0.6/pkg_resources.txt ============================================================================== --- sandbox/branches/setuptools-0.6/pkg_resources.txt (original) +++ sandbox/branches/setuptools-0.6/pkg_resources.txt Thu May 31 19:30:55 2007 @@ -1697,6 +1697,9 @@ * Allow ``.egg-link`` files to contain relative paths. + * Fix cache dir defaults on Windows when multiple environment vars are needed + to construct a path. + 0.6c4 * Fix "dev" versions being considered newer than release candidates. Modified: sandbox/branches/setuptools-0.6/setuptools.txt ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools.txt (original) +++ sandbox/branches/setuptools-0.6/setuptools.txt Thu May 31 19:30:55 2007 @@ -1485,8 +1485,10 @@ you use any option at all. (By the way, if you're using some other revision control system, you might -consider submitting a patch to the ``setuptools.command.sdist`` module, -so we can include support for your system.) +consider creating and publishing a `revision control plugin for setuptools`_.) + + +.. _revision control plugin for setuptools: `Adding Support for Other Revision Control Systems`_ Making your package available for EasyInstall @@ -2626,6 +2628,9 @@ * Fix ``test`` command possibly failing if an older version of the project being tested was installed on ``sys.path`` ahead of the test source directory. + + * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in + their names as packages. 0.6c5 * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg`` Modified: sandbox/branches/setuptools-0.6/setuptools/__init__.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/__init__.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/__init__.py Thu May 31 19:30:55 2007 @@ -30,11 +30,11 @@ where,prefix = stack.pop(0) for name in os.listdir(where): fn = os.path.join(where,name) - if (os.path.isdir(fn) and + if ('.' not in name and os.path.isdir(fn) and os.path.isfile(os.path.join(fn,'__init__.py')) ): out.append(prefix+name); stack.append((fn,prefix+name+'.')) - for pat in exclude: + for pat in list(exclude)+['ez_setup']: from fnmatch import fnmatchcase out = [item for item in out if not fnmatchcase(item,pat)] return out 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 Thu May 31 19:30:55 2007 @@ -132,14 +132,14 @@ rels = map(str.strip, rel.lower().split(',')) if 'homepage' in rels or 'download' in rels: for match in HREF.finditer(tag): - yield urlparse.urljoin(url, match.group(1)) + yield urlparse.urljoin(url, htmldecode(match.group(1))) for tag in ("<th>Home Page", "<th>Download URL"): pos = page.find(tag) if pos!=-1: match = HREF.search(page,pos) if match: - yield urlparse.urljoin(url, match.group(1)) + yield urlparse.urljoin(url, htmldecode(match.group(1))) user_agent = "Python-urllib/%s setuptools/%s" % ( urllib2.__version__, require('setuptools')[0].version @@ -200,7 +200,7 @@ if url.startswith(self.index_url) and getattr(f,'code',None)!=404: page = self.process_index(url, page) for match in HREF.finditer(page): - link = urlparse.urljoin(base, match.group(1)) + link = urlparse.urljoin(base, htmldecode(match.group(1))) self.process_url(link) def process_filename(self, fn, nested=False): @@ -262,7 +262,7 @@ # process an index page into the package-page index for match in HREF.finditer(page): - scan( urlparse.urljoin(url, match.group(1)) ) + scan( urlparse.urljoin(url, htmldecode(match.group(1))) ) pkg, ver = scan(url) # ensure this page is in the page index if pkg: @@ -611,6 +611,8 @@ self.url_ok(url, True) # raises error if not allowed return self._attempt_download(url, filename) + + def scan_url(self, url): self.process_url(url, True) @@ -652,6 +654,44 @@ def warn(self, msg, *args): log.warn(msg, *args) +# This pattern matches a character entity reference (a decimal numeric +# references, a hexadecimal numeric reference, or a named reference). +entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub + +def uchr(c): + if not isinstance(c, int): + return c + if c>255: return unichr(c) + return chr(c) + +def decode_entity(match): + what = match.group(1) + if what.startswith('#x'): + what = int(what[2:], 16) + elif what.startswith('#'): + what = int(what[1:]) + else: + from htmlentitydefs import name2codepoint + what = name2codepoint.get(what, match.group(0)) + return uchr(what) + +def htmldecode(text): + """Decode HTML entities in the given text.""" + return entity_sub(decode_entity, text) + + + + + + + + + + + + + +

1 0