Mailman 3 June 2007 - Python-checkins

r55996 - python/branches/cpy_merge/Lib/io.py
by alexandre.vassalotti 15 Jun '07

15 Jun '07

Author: alexandre.vassalotti Date: Fri Jun 15 19:47:00 2007 New Revision: 55996 Modified: python/branches/cpy_merge/Lib/io.py Log: Rename StringIO to _StringIO. Modified: python/branches/cpy_merge/Lib/io.py ============================================================================== --- python/branches/cpy_merge/Lib/io.py (original) +++ python/branches/cpy_merge/Lib/io.py Fri Jun 15 19:47:00 2007 @@ -595,7 +595,7 @@ # XXX This should inherit from TextIOBase -class StringIO(_MemoryIOMixin): +class _StringIO(_MemoryIOMixin): """Buffered I/O implementation using a string buffer, like StringIO."""

1 0

r55995 - python/branches/release25-maint/Modules/_ctypes python/branches/release25-maint/Modules/_ctypes/callproc.c python/branches/release25-maint/Modules/_ctypes/ctypes.h
by thomas.heller 15 Jun '07

15 Jun '07

Author: thomas.heller Date: Fri Jun 15 19:10:41 2007 New Revision: 55995 Modified: python/branches/release25-maint/Modules/_ctypes/ (props changed) python/branches/release25-maint/Modules/_ctypes/callproc.c python/branches/release25-maint/Modules/_ctypes/ctypes.h Log: Merged revisions 55896 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk/Modules/_ctypes ........ r55896 | thomas.heller | 2007-06-11 17:58:33 +0200 (Mo, 11 Jun 2007) | 3 lines Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k" or "K" codes. ........ Modified: python/branches/release25-maint/Modules/_ctypes/callproc.c ============================================================================== --- python/branches/release25-maint/Modules/_ctypes/callproc.c (original) +++ python/branches/release25-maint/Modules/_ctypes/callproc.c Fri Jun 15 19:10:41 2007 @@ -1029,6 +1029,15 @@ return retval; } +static int +_parse_voidp(PyObject *obj, void **address) +{ + *address = PyLong_AsVoidPtr(obj); + if (*address == NULL) + return 0; + return 1; +} + #ifdef MS_WIN32 #ifdef _UNICODE @@ -1112,7 +1121,7 @@ static PyObject *free_library(PyObject *self, PyObject *args) { void *hMod; - if (!PyArg_ParseTuple(args, PY_VOID_P_CODE ":FreeLibrary", &hMod)) + if (!PyArg_ParseTuple(args, "O&:FreeLibrary", &_parse_voidp, &hMod)) return NULL; if (!FreeLibrary((HMODULE)hMod)) return PyErr_SetFromWindowsErr(GetLastError()); @@ -1235,7 +1244,7 @@ { void *handle; - if (!PyArg_ParseTuple(args, PY_VOID_P_CODE ":dlclose", &handle)) + if (!PyArg_ParseTuple(args, "O&:dlclose", &_parse_voidp, &handle)) return NULL; if (dlclose(handle)) { PyErr_SetString(PyExc_OSError, @@ -1252,7 +1261,8 @@ void *handle; void *ptr; - if (!PyArg_ParseTuple(args, PY_VOID_P_CODE "s:dlsym", &handle, &name)) + if (!PyArg_ParseTuple(args, "O&s:dlsym", + &_parse_voidp, &handle, &name)) return NULL; ptr = ctypes_dlsym(handle, name); if (!ptr) { @@ -1277,8 +1287,8 @@ PyObject *result; if (!PyArg_ParseTuple(args, - PY_VOID_P_CODE "O!", - &func, + "O&O!", + &_parse_voidp, &func, &PyTuple_Type, &arguments)) return NULL; @@ -1308,8 +1318,8 @@ PyObject *result; if (!PyArg_ParseTuple(args, - PY_VOID_P_CODE "O!", - &func, + "O&O!", + &_parse_voidp, &func, &PyTuple_Type, &arguments)) return NULL; Modified: python/branches/release25-maint/Modules/_ctypes/ctypes.h ============================================================================== --- python/branches/release25-maint/Modules/_ctypes/ctypes.h (original) +++ python/branches/release25-maint/Modules/_ctypes/ctypes.h Fri Jun 15 19:10:41 2007 @@ -23,12 +23,6 @@ #define PY_LONG_LONG LONG_LONG #endif -#if SIZEOF_VOID_P == SIZEOF_LONG -#define PY_VOID_P_CODE "k" -#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P == SIZEOF_LONG_LONG) -#define PY_VOID_P_CODE "K" -#endif - typedef struct tagPyCArgObject PyCArgObject; typedef struct tagCDataObject CDataObject; typedef PyObject *(* GETFUNC)(void *, unsigned size);

1 0

r55994 - in sandbox/trunk/pep0: NOTES pep0/pep.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 05:59:31 2007 New Revision: 55994 Modified: sandbox/trunk/pep0/NOTES sandbox/trunk/pep0/pep0/pep.py Log: Add code to verify author names. Leave commented out, though, as there is an obvious disparity between the author names in the PEPs and those in the index. Modified: sandbox/trunk/pep0/NOTES ============================================================================== --- sandbox/trunk/pep0/NOTES (original) +++ sandbox/trunk/pep0/NOTES Fri Jun 15 05:59:31 2007 @@ -5,13 +5,8 @@ * Author/email list. + Fix loss of a single space when name contains an accented character. - + Column headers. - - Underline to length of author name or just column header like in - rest of doc? * Verify PEP is well-formatted. - + Values in fields correct. - - All authors declared in email list. + Formatting correct. - Plaintext. - reST. @@ -55,3 +50,5 @@ - Conflicts with Accepted and Deferred initials, respectively. - Worth using other letters? + * Disparity between author name in PEPs and listed in index. + + E.g., "Barry A. Warsaw" and "Warsaw, Barry". Modified: sandbox/trunk/pep0/pep0/pep.py ============================================================================== --- sandbox/trunk/pep0/pep0/pep.py (original) +++ sandbox/trunk/pep0/pep0/pep.py Fri Jun 15 05:59:31 2007 @@ -32,6 +32,9 @@ status_values = ("Accepted", "Rejected", "Withdrawn", "Deferred", "Final", "Active", "Draft") + # XXX Uncomment to valid author names (along with code in __init__). + #valid_authors = set(x[0] for x in constants.email_addresses) + def __init__(self, metadata_dict): """Init object based on dict containing metadata from a file. @@ -77,6 +80,10 @@ self.status = status # 'Author'. authors = self._parse_author(metadata_dict['Author']) + # XXX Uncomment (plus valid_authors) to validate author names. + #for author in authors: + # if author not in self.valid_authors: + # raise ValueError("%s is not a valid author name" % author) if len(authors) < 1: raise ValueError("no authors found (PEP %s)" % self.number) self.authors = authors

1 0

r55993 - sandbox/trunk/pep0/pep0/constants.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 05:53:36 2007 New Revision: 55993 Modified: sandbox/trunk/pep0/pep0/constants.py Log: Update references. Modified: sandbox/trunk/pep0/pep0/constants.py ============================================================================== --- sandbox/trunk/pep0/pep0/constants.py (original) +++ sandbox/trunk/pep0/pep0/constants.py Fri Jun 15 05:53:36 2007 @@ -26,9 +26,6 @@ references = """ [1] View PEP history online http://svn.python.org/projects/peps/trunk/ - - [2] The Benevolent Dictator For Life's Parade of PEPs - http://www.python.org/doc/essays/pepparade.html """ footer = """

1 0

r55992 - in sandbox/trunk/pep0: NOTES pep0/output.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 05:52:05 2007 New Revision: 55992 Modified: sandbox/trunk/pep0/NOTES sandbox/trunk/pep0/pep0/output.py Log: Output author list. Modified: sandbox/trunk/pep0/NOTES ============================================================================== --- sandbox/trunk/pep0/NOTES (original) +++ sandbox/trunk/pep0/NOTES Fri Jun 15 05:52:05 2007 @@ -4,15 +4,14 @@ * Read PEPs as UTF-8. * Author/email list. - + names - + emails + + Fix loss of a single space when name contains an accented character. + Column headers. - Underline to length of author name or just column header like in rest of doc? * Verify PEP is well-formatted. + Values in fields correct. - - All authors declared in authors.py. + - All authors declared in email list. + Formatting correct. - Plaintext. - reST. Modified: sandbox/trunk/pep0/pep0/output.py ============================================================================== --- sandbox/trunk/pep0/pep0/output.py (original) +++ sandbox/trunk/pep0/pep0/output.py Fri Jun 15 05:52:05 2007 @@ -1,7 +1,8 @@ """Code to handle the output of PEP 0.""" from . import constants -from .pep import PEP +from .pep import PEP, last_name +from operator import itemgetter from sys import stdout @@ -117,13 +118,27 @@ print>>output print>>output, "Owners" print>>output - # XXX - # * get "last, first I." of each name. - # * add nickname. - # * find longest name. - # * column headers. - # * name/email with a two-space separation between longest name and email. - print>>output, ' XXX' + max_name_len = len(max(constants.email_addresses, key=itemgetter(0))) + for name, nick in constants.nicknames.items(): + name_nick_len = len(name) + len(nick) + 3 # Cover space and parens. + if name_nick_len > max_name_len: + max_name_len = name_nick_len + else: + max_name_len += 2 # Cover comma and space between last and first name. + print>>output, " %s %s" % ('name'.ljust(max_name_len), 'email address') + print>>output, " %s %s" % ((len('name')*'-').ljust(max_name_len), + len('email address')*'-') + for author, email in constants.email_addresses: + last_name_index = author.index(last_name(author)) + first = author[:last_name_index].strip() + last = author[last_name_index:].strip() + if not first: + last_first = last + else: + last_first = ', '.join([last, first]) + if author in constants.nicknames: + last_first += " (%s)" % constants.nicknames[author] + print>>output, " %s %s" % (last_first.ljust(max_name_len), email) print>>output print>>output print>>output, "References"

1 0

r55990 - sandbox/trunk/pep0/pep0/pep.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 05:48:10 2007 New Revision: 55990 Modified: sandbox/trunk/pep0/pep0/pep.py Log: Import 'constants' instead of parts of the module. Modified: sandbox/trunk/pep0/pep0/pep.py ============================================================================== --- sandbox/trunk/pep0/pep0/pep.py (original) +++ sandbox/trunk/pep0/pep0/pep.py Fri Jun 15 05:48:10 2007 @@ -1,5 +1,5 @@ """Code for handling object representation of a PEP.""" -from .constants import nicknames, column_format +from . import constants import re @@ -117,10 +117,10 @@ else: status_abbr = self.status[0].upper() pep_info['status'] = status_abbr - author_string = ', '.join(last_name(author, nicknames) + author_string = ', '.join(last_name(author, constants.nicknames) for author in self.authors) pep_info['authors'] = author_string - return column_format % pep_info + return constants.column_format % pep_info def last_name(full_name, nicknames={}):

1 0

r55989 - sandbox/trunk/pep0/pep0/constants.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 05:46:18 2007 New Revision: 55989 Modified: sandbox/trunk/pep0/pep0/constants.py Log: Move author/email list over to a tuple instead of a dict. Either have it in a dict so that verifying that a PEP's listed author is legit is fast, but then pay the price when outputting the author list (make a sequence and sort the thing), or make it a sequence and pay the price in verifyin the author's name. Modified: sandbox/trunk/pep0/pep0/constants.py ============================================================================== --- sandbox/trunk/pep0/pep0/constants.py (original) +++ sandbox/trunk/pep0/pep0/constants.py Fri Jun 15 05:46:18 2007 @@ -45,105 +45,106 @@ 'Just van Rossum' : 'JvR', } -email_addresses = { - 'Aahz' : 'aahz(a)pobox.com', - 'James C. Ahlstrom' : 'jim(a)interet.com', - 'Jim Althoff' : 'james_althoff(a)i2.com', - 'Kevin Altis' : 'altis(a)semi-retired.com', - 'David Ascher' : 'davida(a)activestate.com', - 'Peter Astrand' : 'astrand(a)lysator.liu.se', - 'Carl Banks' : 'pythondev(a)aerojockey.com', - 'Paul Barrett' : 'barrett(a)stsci.edu', - 'Facundo Batista' : 'facundo(a)taniquetil.com.ar', - 'Anthony Baxter' : 'anthony(a)interlink.com.au', - 'Thomas Bellman' : 'bellman+pep-divmod(a)lysator.liu.se', - 'Steven Bethard' : 'steven.bethard(a)gmail.com', - 'Georg Brandl' : 'g.brandl(a)gmx.net', - 'Brett Cannon' : 'brett(a)python.org', - 'Josiah Carlson' : 'jcarlson(a)uci.edu', - 'W Isaac Carroll' : 'icarroll(a)pobox.com', - 'Nick Coghlan' : 'ncoghlan(a)gmail.com', - 'Dave Cole' : 'djc(a)object-craft.com.au', - 'Christopher Craig' : 'python-pep(a)ccraig.org', - 'Laura Creighton' : 'lac(a)strakt.com', - 'Walter Dörwald' : '', - 'Fred L. Drake, Jr.' : 'fdrake(a)acm.org', - 'Michael P. Dubner' : 'dubnerm(a)mindless.com', - 'Paul F. Dubois' : 'paul(a)pfdubois.com', - 'Phillip J. Eby' : 'pje(a)telecommunity.com', - 'Micah Elliott' : 'mde at tracos.org', - 'Jeff Epler' : 'jepler(a)unpythonic.net', - 'David Eppstein' : 'eppstein(a)ics.uci.edu', - 'Clark C. Evans' : 'cce(a)clarkevans.com', - 'Greg Ewing' : 'greg(a)cosc.canterbury.ac.nz', - 'Martijn Faassen' : 'faassen(a)infrae.com', - 'Ben Finney' : 'ben+python(a)benfinney.id.au', - 'Frédéric B. Giacometti' : 'fred(a)arakne.com', - 'Scott Gilbert' : 'xscottg at yahoo.com', - 'David Goodger' : 'goodger(a)python.org', - 'Grant Griffin' : 'g2(a)iowegian.com', - 'Mark Hammond' : 'mhammond(a)skippinet.com.au', - 'Peter Harris' : 'scav(a)blueyonder.co.uk', - 'Thomas Heller' : 'theller(a)python.net', - 'Magnus Lie Hetland' : 'magnus(a)hetland.org', - 'Raymond D. Hettinger' : 'python(a)rcn.com', - 'Neil Hodgson' : 'neilh(a)scintilla.org', - 'Michael Hudson' : 'mwh(a)python.net', - 'Jeremy Hylton' : 'jeremy(a)zope.com', - 'Jack Jansen' : 'jack(a)cwi.nl', - 'Jim Jewett' : 'jimjjewett(a)users.sourceforge.net', - 'Richard Jones' : 'richard(a)mechanicalcat.net', - 'Stepan Koltsov' : 'yozh(a)mx1.ru', - 'A.M. Kuchling' : 'amk(a)amk.ca', - 'Marc-Andre Lemburg' : 'mal(a)lemburg.com', - 'Gregory Lielens' : 'gregory.lielens(a)fft.be', - 'Björn Lindqvist' : 'bjourne(a)gmail.com', - 'Martin von Löwis' : 'loewis(a)informatik.hu-berlin.de', - 'Tony Lownds' : 'tony(a)pagedna.com', - 'Alex Martelli' : 'aleax(a)aleax.it', - 'Andrew McClelland' : 'eternalsquire(a)comcast.net', - 'Gordon McMillan' : 'gmcm(a)hypernet.com', - 'Andrew McNamara' : 'andrewm(a)object-craft.com.au', - 'Trent Mick' : 'trentm(a)activestate.com', - 'Mike Meyer' : 'mwm(a)mired.org', - 'Skip Montanaro' : 'skip(a)pobox.com', - 'Paul Moore' : 'gustav(a)morpheus.demon.co.uk', - 'Ben North' : 'ben at redfrontdoor.org', - 'Neal Norwitz' : 'nnorwitz(a)gmail.com', - 'Travis Oliphant' : 'oliphant(a)ee.byu.edu', - 'Jason Orendorff' : 'jason.orendorff(a)gmail.com', - 'Samuele Pedroni' : 'pedronis(a)python.org', - 'Michel Pelletier' : 'michel(a)users.sourceforge.net', - 'Tim Peters' : 'tim(a)zope.com', - 'Jason Petrone' : 'jp(a)demonseed.net', - 'Paul Prescod' : 'paul(a)prescod.net', - 'Terry Reedy' : 'tjreedy(a)udel.edu', - 'Sean Reifschneider' : 'jafo-pep(a)tummy.com', - 'Christian R. Reis' : 'kiko(a)async.com.br', - 'Jonathan Riehl' : 'jriehl(a)spaceship.com', - 'André Roberge' : 'andre.roberge(a)gmail.com', - 'Guido van Rossum' : 'guido(a)python.org', - 'Just van Rossum' : 'just(a)letterror.com', - 'Vinay Sajip' : 'vinay_sajip(a)red-dove.com', - 'Neil Schemenauer' : 'nas(a)arctrix.com', - 'Peter Schneider-Kamp' : 'nowonder(a)nowonder.de', - 'Jiwon Seo' : 'seojiwon(a)gmail.com', - 'Kevin D. Smith' : 'Kevin.Smith(a)theMorgue.org', - 'Greg Stein' : 'gstein(a)lyra.org', - 'Daniel Stutzbach' : 'daniel.stutzbach(a)gmail.com', - 'Roman Suzi' : 'rnd(a)onego.ru', - 'Talin' : 'talin at acm.org', - 'Steven Taschuk' : 'staschuk(a)telusplanet.net', - 'Oren Tirosh' : 'oren at hishome.net', - 'Mike Verdone' : 'mike.verdone(a)gmail.com', - 'Gregory R. Warnes' : 'warnes(a)users.sourceforge.net', - 'Barry Warsaw' : 'barry(a)python.org', - 'Terence Way' : 'terry(a)wayforward.net', - 'Cliff Wells' : 'LogiplexSoftware(a)earthlink.net', - 'Greg Wilson' : 'gvwilson(a)ddj.com', - 'Collin Winter' : 'collinw(a)gmail.com', - 'Thomas Wouters' : 'thomas(a)python.org', - 'Ka-Ping Yee' : 'ping(a)zesty.ca', - 'Moshe Zadka' : 'moshez(a)zadka.site.co.il', - 'Huaiyu Zhu' : 'hzhu(a)users.sourceforge.net', -} +# Keep alphabetized! +email_addresses = ( + ('Aahz' , 'aahz(a)pobox.com'), + ('James C. Ahlstrom' , 'jim(a)interet.com'), + ('Jim Althoff' , 'james_althoff(a)i2.com'), + ('Kevin Altis' , 'altis(a)semi-retired.com'), + ('David Ascher' , 'davida(a)activestate.com'), + ('Peter Astrand' , 'astrand(a)lysator.liu.se'), + ('Carl Banks' , 'pythondev(a)aerojockey.com'), + ('Paul Barrett' , 'barrett(a)stsci.edu'), + ('Facundo Batista' , 'facundo(a)taniquetil.com.ar'), + ('Anthony Baxter' , 'anthony(a)interlink.com.au'), + ('Thomas Bellman' , 'bellman+pep-divmod(a)lysator.liu.se'), + ('Steven Bethard' , 'steven.bethard(a)gmail.com'), + ('Georg Brandl' , 'g.brandl(a)gmx.net'), + ('Brett Cannon' , 'brett(a)python.org'), + ('Josiah Carlson' , 'jcarlson(a)uci.edu'), + ('W Isaac Carroll' , 'icarroll(a)pobox.com'), + ('Nick Coghlan' , 'ncoghlan(a)gmail.com'), + ('Dave Cole' , 'djc(a)object-craft.com.au'), + ('Christopher Craig' , 'python-pep(a)ccraig.org'), + ('Laura Creighton' , 'lac(a)strakt.com'), + ('Walter Dörwald' , ''), + ('Fred L. Drake, Jr.' , 'fdrake(a)acm.org'), + ('Michael P. Dubner' , 'dubnerm(a)mindless.com'), + ('Paul F. Dubois' , 'paul(a)pfdubois.com'), + ('Phillip J. Eby' , 'pje(a)telecommunity.com'), + ('Micah Elliott' , 'mde at tracos.org'), + ('Jeff Epler' , 'jepler(a)unpythonic.net'), + ('David Eppstein' , 'eppstein(a)ics.uci.edu'), + ('Clark C. Evans' , 'cce(a)clarkevans.com'), + ('Greg Ewing' , 'greg(a)cosc.canterbury.ac.nz'), + ('Martijn Faassen' , 'faassen(a)infrae.com'), + ('Ben Finney' , 'ben+python(a)benfinney.id.au'), + ('Frédéric B. Giacometti' , 'fred(a)arakne.com'), + ('Scott Gilbert' , 'xscottg at yahoo.com'), + ('David Goodger' , 'goodger(a)python.org'), + ('Grant Griffin' , 'g2(a)iowegian.com'), + ('Mark Hammond' , 'mhammond(a)skippinet.com.au'), + ('Peter Harris' , 'scav(a)blueyonder.co.uk'), + ('Thomas Heller' , 'theller(a)python.net'), + ('Magnus Lie Hetland' , 'magnus(a)hetland.org'), + ('Raymond D. Hettinger' , 'python(a)rcn.com'), + ('Neil Hodgson' , 'neilh(a)scintilla.org'), + ('Michael Hudson' , 'mwh(a)python.net'), + ('Jeremy Hylton' , 'jeremy(a)zope.com'), + ('Jack Jansen' , 'jack(a)cwi.nl'), + ('Jim Jewett' , 'jimjjewett(a)users.sourceforge.net'), + ('Richard Jones' , 'richard(a)mechanicalcat.net'), + ('Stepan Koltsov' , 'yozh(a)mx1.ru'), + ('A.M. Kuchling' , 'amk(a)amk.ca'), + ('Marc-Andre Lemburg' , 'mal(a)lemburg.com'), + ('Gregory Lielens' , 'gregory.lielens(a)fft.be'), + ('Björn Lindqvist' , 'bjourne(a)gmail.com'), + ('Martin von Löwis' , 'loewis(a)informatik.hu-berlin.de'), + ('Tony Lownds' , 'tony(a)pagedna.com'), + ('Alex Martelli' , 'aleax(a)aleax.it'), + ('Andrew McClelland' , 'eternalsquire(a)comcast.net'), + ('Gordon McMillan' , 'gmcm(a)hypernet.com'), + ('Andrew McNamara' , 'andrewm(a)object-craft.com.au'), + ('Trent Mick' , 'trentm(a)activestate.com'), + ('Mike Meyer' , 'mwm(a)mired.org'), + ('Skip Montanaro' , 'skip(a)pobox.com'), + ('Paul Moore' , 'gustav(a)morpheus.demon.co.uk'), + ('Ben North' , 'ben at redfrontdoor.org'), + ('Neal Norwitz' , 'nnorwitz(a)gmail.com'), + ('Travis Oliphant' , 'oliphant(a)ee.byu.edu'), + ('Jason Orendorff' , 'jason.orendorff(a)gmail.com'), + ('Samuele Pedroni' , 'pedronis(a)python.org'), + ('Michel Pelletier' , 'michel(a)users.sourceforge.net'), + ('Tim Peters' , 'tim(a)zope.com'), + ('Jason Petrone' , 'jp(a)demonseed.net'), + ('Paul Prescod' , 'paul(a)prescod.net'), + ('Terry Reedy' , 'tjreedy(a)udel.edu'), + ('Sean Reifschneider' , 'jafo-pep(a)tummy.com'), + ('Christian R. Reis' , 'kiko(a)async.com.br'), + ('Jonathan Riehl' , 'jriehl(a)spaceship.com'), + ('André Roberge' , 'andre.roberge(a)gmail.com'), + ('Guido van Rossum' , 'guido(a)python.org'), + ('Just van Rossum' , 'just(a)letterror.com'), + ('Vinay Sajip' , 'vinay_sajip(a)red-dove.com'), + ('Neil Schemenauer' , 'nas(a)arctrix.com'), + ('Peter Schneider-Kamp' , 'nowonder(a)nowonder.de'), + ('Jiwon Seo' , 'seojiwon(a)gmail.com'), + ('Kevin D. Smith' , 'Kevin.Smith(a)theMorgue.org'), + ('Greg Stein' , 'gstein(a)lyra.org'), + ('Daniel Stutzbach' , 'daniel.stutzbach(a)gmail.com'), + ('Roman Suzi' , 'rnd(a)onego.ru'), + ('Talin' , 'talin at acm.org'), + ('Steven Taschuk' , 'staschuk(a)telusplanet.net'), + ('Oren Tirosh' , 'oren at hishome.net'), + ('Mike Verdone' , 'mike.verdone(a)gmail.com'), + ('Gregory R. Warnes' , 'warnes(a)users.sourceforge.net'), + ('Barry Warsaw' , 'barry(a)python.org'), + ('Terence Way' , 'terry(a)wayforward.net'), + ('Cliff Wells' , 'LogiplexSoftware(a)earthlink.net'), + ('Greg Wilson' , 'gvwilson(a)ddj.com'), + ('Collin Winter' , 'collinw(a)gmail.com'), + ('Thomas Wouters' , 'thomas(a)python.org'), + ('Ka-Ping Yee' , 'ping(a)zesty.ca'), + ('Moshe Zadka' , 'moshez(a)zadka.site.co.il'), + ('Huaiyu Zhu' , 'hzhu(a)users.sourceforge.net'), +)

1 0

r55988 - sandbox/trunk/pep0/test_pep0.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 05:42:49 2007 New Revision: 55988 Removed: sandbox/trunk/pep0/test_pep0.py Log: Ditch test file. Just easier to run on actual PEPs. Deleted: /sandbox/trunk/pep0/test_pep0.py ============================================================================== --- /sandbox/trunk/pep0/test_pep0.py Fri Jun 15 05:42:49 2007 +++ (empty file) @@ -1,313 +0,0 @@ -from __future__ import with_statement -import pep0.parse - -import itertools -import unittest -from test import test_support -from contextlib import contextmanager -import os - -class ParseTests(unittest.TestCase): - - """Test pep0.parse .""" - - def create_path(self): - return test_support.TESTFN + str(self.num) - - def setUp(self): - self.num = 42 - self.path = self.create_path() - - def tearDown(self): - if os.path.exists(self.path): - os.unlink(self.path) - - def create_simple_pep(self, num=None): - if num is None: - num = self.num - with open(self.path, 'w') as pep_file: - pep_file.write("PEP: %s\n\nBody" % num) - - def test_split_metadata_single_line(self): - # Test basic use case. - gave_field = "field" - gave_data = "data" - # Spaces in separator help test whitespace stripping. - for sep in (':', ' :', ': '): - line = sep.join([gave_field, gave_data]) - got_field, got_data = pep0.parse.split_metadata(line) - self.failUnlessEqual(gave_field, got_field) - self.failUnlessEqual(gave_data, got_data) - bad_line = 'abc' - self.failUnlessRaises(ValueError, pep0.parse.split_metadata, bad_line) - - def test_split_metadata_continuing_line(self): - # Make sure that if the line is considered a continuation of another - # one that the same field is returned. - gave_field ='a' - gave_data = 'b:c' - got_field, got_data = pep0.parse.split_metadata(gave_data, gave_field) - self.failUnlessEqual(got_field, gave_field) - self.failUnlessEqual(got_data, gave_data) - - def test_consume_pep_number_field(self): - # All PEPs must have a PEP field. - self.create_simple_pep() - metadata = pep0.parse.consume_pep(self.path) - self.failUnless('PEP' in metadata) - self.failUnlessEqual(metadata['PEP'], self.num) - - def test_consume_pep_file_name(self): - # The PEP number is expected to be in file name. - # Testing positive results implicit in other tests of pep0.consume_pep. - self.path = test_support.TESTFN - assert str(self.num) not in self.path - self.create_simple_pep() - self.failUnlessRaises(ValueError, pep0.parse.consume_pep, self.path) - - def test_consume_pep_valid_int(self): - # The found value of the 'PEP' field is expected to be a valid number. - self.create_simple_pep("XXX") - self.failUnlessRaises(ValueError, pep0.parse.consume_pep, self.path) - - def test_consume_pep_multiline_data(self): - # If data spans multiple lines it should come out as a single one after - # parsing. - line1 = "a, b, c," - line2 = "d, e, f" - with open(self.path, 'w') as pep_file: - pep_file.write("PEP: %s\n" % self.num) - pep_file.write("multiline: a, b, c,\n") - pep_file.write(" d, e, f\n") - pep_file.write("\nBody") - metadata = pep0.parse.consume_pep(self.path) - self.failUnlessEqual(metadata['multiline'], line1 + line2) - - -class HandlerTests(unittest.TestCase): - - """Test the PEP field handlers for parsing data.""" - - def test_handle_generic(self): - # Identity function. - for data in ('spam', 'spam,', '', 'spam, monty'): - self.failUnlessEqual(pep0.handle_generic(data), data) - - def test_pep_num(self): - # String -> int. - num = 42 - string_rep = str(num) - self.failUnlessEqual(pep0.handle_pep_num(string_rep), num) - - def test_handle_csv(self): - # Split on commas. - data = ['a', 'b', 'c'] - string_rep = ','.join(data) - self.failUnlessEqual(pep0.handle_csv(string_rep), data) - string_rep = ', '.join(data) - self.failUnlessEqual(pep0.handle_csv(string_rep), data) - string_rep = ', '.join(data) + ',' - got = pep0.handle_csv(string_rep) - self.failUnlessEqual(got, data, - '%r != %r (using %r)' % - (got, data, string_rep)) - - def test_handle_author(self): - # Handle the various ways authors can be specified. - # Test needs to validate not just how the author's name can be written - # but also variations in people's names (e.g., 'van', 'Jr.', etc.). - authors = ["Guido van Rossum", "Brett Cannon", "Fred L. Drake, Jr.", - "Aahz"] - formats = ["%s <email>", "email (%s)", "%s"] - for format in formats: - for author_count in range(len(authors)): - rep = ', '.join(format % author - for author in authors[:author_count+1]) - expect = authors[:author_count+1] - got = pep0.handle_author(rep) - self.failUnlessEqual(got, expect) - # Test with a trailing comma. - rep += ',' - got = pep0.handle_author(rep) - self.failUnlessEqual(got, expect) - - -class PEPClassTests(unittest.TestCase): - - """Test the PEP class.""" - - def setUp(self): - self.metadata = {'PEP': 42, 'Type': pep0.pep.PEP.type_values[0], - 'Status': pep0.pep.PEP.status_values[0], - 'Author': "Brett Cannon"} - - def test_init_number(self): - # PEP number must be an int. - pep = pep0.pep.PEP(self.metadata) - self.failUnlessEqual(pep.number, self.metadata['PEP']) - self.metadata['PEP'] = 'XXX' - self.failUnlessRaises(ValueError, pep0.pep.PEP, self.metadata) - - def test_init_status(self): - # Invalid Status entry raises an exception. - pass - - def test_init_type(self): - # Invalid type should raise an exception. - pass - - def test_init_authors(self): - # There should be at least one author. - pass - - -@contextmanager -def test_file(path): - try: - open_file = open(path, 'w') - yield open_file - finally: - open_file.close() - if os.path.exists(path): - os.unlink(path) - - -class ConsumePepTests(unittest.TestCase): - - """Test the reading and parsing of a PEP file.""" - - def test_single_line(self): - # Test a PEP that only has a single line of metadata. - type_ = 'Spam' - data = 'Monty' - with test_file(test_support.TESTFN) as pep_file: - pep_file.write('%s: %s\n' % (type_, data)) - pep_file.write('\n') - pep_file.write('The PEP.') - pep_file.close() - metadata = pep0.consume_pep(test_support.TESTFN) - self.failUnless(type_ in metadata) - self.failUnlessEqual(metadata[type_], data) - - def test_multi_line_authors(self): - # Make sure that metadata that takes multiple lines works when it - # is expected (e.g., Author and Post-History). - authors = ['A', 'B'] - output = 'Author: ' + authors[0] + '\n' - output += ' ' + authors[1] + '\n' - with test_file(test_support.TESTFN) as pep_file: - pep_file.write(output) - pep_file.write('\n') - pep_file.write('The PEP.') - pep_file.close() - metadata = pep0.consume_pep(test_support.TESTFN) - self.failUnless('Author' in metadata) - self.failUnlessEqual(metadata['Author'], authors) - - def test_multi_line_post_history(self): - # Post-History entries on multiple lines is fine. - dates = ['04-Jul-1776', '23-Oct-2007', '01-Jan-2001'] - output = 'Post-History: ' + ', '.join(dates[:2]) + '\n' - output += ' ' + dates[2] + '\n' - with test_file(test_support.TESTFN) as pep_file: - pep_file.write(output) - pep_file.write('\n') - pep_file.write('The PEP.') - pep_file.close() - metadata = pep0.consume_pep(test_support.TESTFN) - self.failUnless('Post-History' in metadata) - self.failUnlessEqual(metadata['Post-History'], dates) - - def test_missing_fields(self): - # Missing key fields should raise ValueError. - # PEP - # Author - # Type - # Status - pass - - def test_pep_field(self): - # PEP field should only contain a number. - pass - - def test_author_field(self): - # Author field should have at least a single author. - pass - - def test_type_field(self): - # Type field should contain only a valid value. - pass - - def test_status_field(self): - # Status field should contain only a valid value. - pass - - -class EntryOutputTests(unittest.TestCase): - - """Tests for single-line output into the index.""" - - def test_make_entry_type(self): - # Test handling of type_ argument. - pass - - def test_make_entry_status(self): - # make_entry's status argument. - pass - - def test_make_entry_number(self): - # make_entry's number argument. - pass - - def test_make_entry_number(self): - # make_entry's title argument. - pass - - def test_make_entry_title(self): - # make_entry's title argument. - pass - - def test_make_entry_owners(self): - # make_entry's owners argument. - pass - - def test_make_entry_column_headers(self): - # Should be able to output column headers properly. - pass - - def test_make_entry_underline(self): - # Underlining of column headers should be okay. - pass - - def test_author_last_name(self): - # Test that last names are discovered properly. - test_names = [("Brett Cannon", "Cannon"), - ("Guido van Rossum", "van Rossum"), - ("Fred L. Drake, Jr.", "Drake"), - ("Aahz", "Aahz"), - ] - for full_name, expect in test_names: - got = pep0.last_name(full_name) - self.failUnlessEqual(got, expect) - - def test_author_nickname(self): - # Make sure nicknames are returned instead of last names when a - # nickname is available. - full_name = 'Guido van Rossum' - nickname = 'GvR' - last_name = 'van Rossum' - got = pep0.last_name(full_name, {full_name:nickname}) - self.failUnlessEqual(got, nickname) - got = pep0.last_name(full_name, {'asdf':nickname}) - self.failUnlessEqual(got, last_name) - - -def test_main(): - test_support.run_unittest( - ParseTests, - PEPClassTests, - ) - - -if __name__ == '__main__': - test_main()

1 0

r55984 - python/trunk/Misc/build.sh
by neal.norwitz 15 Jun '07

15 Jun '07

Author: neal.norwitz Date: Fri Jun 15 05:11:41 2007 New Revision: 55984 Modified: python/trunk/Misc/build.sh Log: urllib2_localnet says it leaks probably due to threads. So ignore it. popen2 is also complaining probably for similar reasons. make install always reports failure, so don't mail in this case. Modified: python/trunk/Misc/build.sh ============================================================================== --- python/trunk/Misc/build.sh (original) +++ python/trunk/Misc/build.sh Fri Jun 15 05:11:41 2007 @@ -67,7 +67,7 @@ # Note: test_XXX (none currently) really leak, but are disabled # so we don't send spam. Any test which really leaks should only # be listed here if there are also test cases under Lib/test/leakers. -LEAKY_TESTS="test_(cmd_line|socket)" +LEAKY_TESTS="test_(cmd_line|popen2|socket|urllib2_localnet)" # Skip these tests altogether when looking for leaks. These tests # do not need to be stored above in LEAKY_TESTS too. @@ -166,7 +166,6 @@ start=`current_time` make install >& build/$F update_status "Installing" "$F" $start - mail_on_failure "install" build/$F if [ ! -x $PYTHON ]; then ln -s ${PYTHON}2.* $PYTHON

1 0

r55983 - sandbox/trunk/pep0/pep0/constants.py sandbox/trunk/pep0/pep0/output.py
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 04:49:18 2007 New Revision: 55983 Modified: sandbox/trunk/pep0/pep0/constants.py sandbox/trunk/pep0/pep0/output.py Log: Fix the output of type and status of a PEP. Modified: sandbox/trunk/pep0/pep0/constants.py ============================================================================== --- sandbox/trunk/pep0/pep0/constants.py (original) +++ sandbox/trunk/pep0/pep0/constants.py Fri Jun 15 04:49:18 2007 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -column_format = ' %(status)1s%(type)1s %(number)4s %(title)-44s %(authors)-s' +column_format = ' %(type)1s%(status)1s %(number)4s %(title)-44s %(authors)-s' header = """PEP: 0 Title: Index of Python Enhancement Proposals (PEPs) Modified: sandbox/trunk/pep0/pep0/output.py ============================================================================== --- sandbox/trunk/pep0/pep0/output.py (original) +++ sandbox/trunk/pep0/pep0/output.py Fri Jun 15 04:49:18 2007 @@ -36,9 +36,9 @@ elif pep.status in ('Rejected', 'Withdrawn', 'Deferred', 'Incomplete'): dead.append(pep) - elif pep.status == 'Process': + elif pep.type_ == 'Process': meta.append(pep) - elif pep.status == 'Informational': + elif pep.type_ == 'Informational': info.append(pep) elif pep.status == 'Accepted': accepted.append(pep) @@ -56,7 +56,7 @@ print>>output, "Index by Category" print>>output write_column_headers(output) - meta, info, accepted, open_, done, empty, dead = sort_peps(peps) + meta, info, accepted, open_, finished, empty, dead = sort_peps(peps) print>>output print>>output, " Meta-PEPs (PEPs about PEPs or Processs)" print>>output @@ -80,7 +80,7 @@ print>>output print>>output, " Finished PEPs (done, implemented in code repository)" print>>output - for pep in done: + for pep in finished: print>>output, pep print>>output print>>output, " Empty PEPs (or containing only abstract)"

1 0