Mailman 3 June 2007 - Python-checkins

r56008 - sandbox/trunk/pep0/pep0/constants.py sandbox/trunk/pep0/pep0/pep.py
by brett.cannon 17 Jun '07

17 Jun '07

Author: brett.cannon Date: Sun Jun 17 19:44:13 2007 New Revision: 56008 Modified: sandbox/trunk/pep0/pep0/constants.py sandbox/trunk/pep0/pep0/pep.py Log: Update output so that title that go beyond the max title length (currently 44), use textwrap.wrap to truncate to a shorter length and have an ellipsis tacked on. Modified: sandbox/trunk/pep0/pep0/constants.py ============================================================================== --- sandbox/trunk/pep0/pep0/constants.py (original) +++ sandbox/trunk/pep0/pep0/constants.py Sun Jun 17 19:44:13 2007 @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -column_format = ' %(type)1s%(status)1s %(number)4s %(title)-44s %(authors)-s' +title_length = 44 +column_format = (' %(type)1s%(status)1s %(number)4s %(title)-' + + str(title_length) + 's %(authors)-s') header = """PEP: 0 Title: Index of Python Enhancement Proposals (PEPs) Modified: sandbox/trunk/pep0/pep0/pep.py ============================================================================== --- sandbox/trunk/pep0/pep0/pep.py (original) +++ sandbox/trunk/pep0/pep0/pep.py Sun Jun 17 19:44:13 2007 @@ -2,6 +2,7 @@ from . import constants import re +import textwrap class PEP(object): @@ -90,6 +91,8 @@ def _parse_author(self, data): """Return a list of author names.""" + # XXX Consider using email.utils.parseaddr (doesn't work with names + # lacking an email address. angled = r'(?P<author>.+?) <.+?>' paren = r'.+? $(?P<author>.+?)$' simple = r'(?P<author>[^,]+)' @@ -115,18 +118,40 @@ return author_list - def __str__(self): - """Return the line entry for the PEP.""" - pep_info = {'type': self.type_[0].upper(), 'number': str(self.number), - 'title': self.title} + @property + def type_abbr(self): + """Return the how the type is to be represented in the index.""" + return self.type_[0].upper() + + + @property + def status_abbr(self): + """Return how the status should be represented in the index.""" if self.status in ('Draft', 'Active'): - status_abbr = ' ' + return ' ' else: - status_abbr = self.status[0].upper() - pep_info['status'] = status_abbr - author_string = ', '.join(last_name(author, constants.nicknames) - for author in self.authors) - pep_info['authors'] = author_string + return self.status[0].upper() + + @property + def author_abbr(self): + """Return the author list as a comma-separated with only last names.""" + return ', '.join(last_name(author, constants.nicknames) + for author in self.authors) + + @property + def title_abbr(self): + """Shorten the title to be no longer than the max title length.""" + if len(self.title) <= constants.title_length: + return self.title + wrapped_title = textwrap.wrap(self.title, constants.title_length - 4) + return wrapped_title[0] + ' ...' + + + def __str__(self): + """Return the line entry for the PEP.""" + pep_info = {'type': self.type_abbr, 'number': str(self.number), + 'title': self.title_abbr, 'status': self.status_abbr, + 'authors': self.author_abbr} return constants.column_format % pep_info

1 0

r56007 - python/branches/release25-maint/Doc/api/concrete.tex
by georg.brandl 16 Jun '07

16 Jun '07

Author: georg.brandl Date: Sat Jun 16 19:10:26 2007 New Revision: 56007 Modified: python/branches/release25-maint/Doc/api/concrete.tex Log: Add missing \versionadded. (backport from rev. 56006) Modified: python/branches/release25-maint/Doc/api/concrete.tex ============================================================================== --- python/branches/release25-maint/Doc/api/concrete.tex (original) +++ python/branches/release25-maint/Doc/api/concrete.tex Sat Jun 16 19:10:26 2007 @@ -99,6 +99,7 @@ \begin{csimplemacrodesc}{Py_RETURN_NONE} Properly handle returning \cdata{Py_None} from within a C function. + \versionadded{2.4} \end{csimplemacrodesc}

1 0

r56006 - python/trunk/Doc/api/concrete.tex
by georg.brandl 16 Jun '07

16 Jun '07

Author: georg.brandl Date: Sat Jun 16 19:10:12 2007 New Revision: 56006 Modified: python/trunk/Doc/api/concrete.tex Log: Add missing \versionadded. Modified: python/trunk/Doc/api/concrete.tex ============================================================================== --- python/trunk/Doc/api/concrete.tex (original) +++ python/trunk/Doc/api/concrete.tex Sat Jun 16 19:10:12 2007 @@ -99,6 +99,7 @@ \begin{csimplemacrodesc}{Py_RETURN_NONE} Properly handle returning \cdata{Py_None} from within a C function. + \versionadded{2.4} \end{csimplemacrodesc}

1 0

r56005 - python/trunk/Misc/developers.txt
by martin.v.loewis 16 Jun '07

16 Jun '07

Author: martin.v.loewis Date: Sat Jun 16 12:08:43 2007 New Revision: 56005 Modified: python/trunk/Misc/developers.txt Log: Mention Senthil Kumaran. Modified: python/trunk/Misc/developers.txt ============================================================================== --- python/trunk/Misc/developers.txt (original) +++ python/trunk/Misc/developers.txt Sat Jun 16 12:08:43 2007 @@ -17,6 +17,10 @@ Permissions History ------------------- +- Senthil Kumaran was given SVN access on June 16 2007 + by MvL, for his Summer-of-Code project, mentored by + Skip Montanaro. + - Alexandre Vassalotti was given SVN access on May 21 2007 by MvL, for his Summer-of-Code project, mentored by Brett Cannon.

1 0

r56002 - python/branches/cpy_merge/Modules/_bytes_iomodule.c python/branches/cpy_merge/Modules/_string_iomodule.c
by alexandre.vassalotti 16 Jun '07

16 Jun '07

Author: alexandre.vassalotti Date: Sat Jun 16 02:01:57 2007 New Revision: 56002 Modified: python/branches/cpy_merge/Modules/_bytes_iomodule.c python/branches/cpy_merge/Modules/_string_iomodule.c Log: Changes for compatibility with PEP 3116. * The truncate method of BytesIO and StringIO now return the new size of the internal buffer. * Make writable, readable and seekable methods, instead of properties. Modified: python/branches/cpy_merge/Modules/_bytes_iomodule.c ============================================================================== --- python/branches/cpy_merge/Modules/_bytes_iomodule.c (original) +++ python/branches/cpy_merge/Modules/_bytes_iomodule.c Sat Jun 16 02:01:57 2007 @@ -115,7 +115,7 @@ /* Generic getter for the writable, readable and seekable properties */ static PyObject * -bytes_io_get_true(BytesIOObject *self) +generic_true(BytesIOObject *self) { Py_RETURN_TRUE; } @@ -269,7 +269,7 @@ self->string_size = size; self->pos = self->string_size; - Py_RETURN_NONE; + return PyInt_FromSsize_t(self->string_size); } static PyObject * @@ -490,11 +490,10 @@ "tell() -> current file position, an integer\n"); PyDoc_STRVAR(BytesIO_truncate_doc, -"truncate([size]) -> None. Truncate the file to at most size bytes.\n" +"truncate([size]) -> int. Truncate the file to at most size bytes.\n" "\n" "Size defaults to the current file position, as returned by tell().\n" -"If the specified size exceeds the file's current size, the file\n" -"remains unchanged."); +"Returns the new size."); PyDoc_STRVAR(BytesIO_close_doc, "close() -> None. Close the file and release the resources held."); @@ -519,20 +518,22 @@ "Note that newlines are not added. The sequence can be any iterable object\n" "producing strings. This is equivalent to calling write() for each string."); +PyDoc_STRVAR(generic_true_doc, "Always True."); + static PyGetSetDef BytesIO_getsetlist[] = { {"closed", (getter) bytes_io_get_closed, NULL, "True if the file is closed."}, - {"writeable", (getter) bytes_io_get_true, NULL, - "Always True."}, - {"readable", (getter) bytes_io_get_true, NULL, - "Always True."}, - {"seekable", (getter) bytes_io_get_true, NULL, - "Always True."}, {0}, /* sentinel */ }; static struct PyMethodDef BytesIO_methods[] = { + {"readable", (PyCFunction) generic_true, METH_NOARGS, + generic_true_doc}, + {"seekable", (PyCFunction) generic_true, METH_NOARGS, + generic_true_doc}, + {"writable", (PyCFunction) generic_true, METH_NOARGS, + generic_true_doc}, {"flush", (PyCFunction) bytes_io_flush, METH_NOARGS, BytesIO_flush_doc}, {"getvalue", (PyCFunction) bytes_io_getvalue, METH_VARARGS, Modified: python/branches/cpy_merge/Modules/_string_iomodule.c ============================================================================== --- python/branches/cpy_merge/Modules/_string_iomodule.c (original) +++ python/branches/cpy_merge/Modules/_string_iomodule.c Sat Jun 16 02:01:57 2007 @@ -118,7 +118,7 @@ /* Generic getter for the writable, readable and seekable properties */ static PyObject * -string_io_get_true(StringIOObject *self) +generic_true(StringIOObject *self) { Py_RETURN_TRUE; } @@ -272,7 +272,7 @@ self->string_size = size; self->pos = self->string_size; - Py_RETURN_NONE; + return PyInt_FromSsize_t(self->string_size); } static PyObject * @@ -500,11 +500,10 @@ "tell() -> current file position, an integer\n"); PyDoc_STRVAR(StringIO_truncate_doc, -"truncate([size]) -> None. Truncate the file to at most size bytes.\n" +"truncate([size]) -> int. Truncate the file to at most size bytes.\n" "\n" "Size defaults to the current file position, as returned by tell().\n" -"If the specified size exceeds the file's current size, the file\n" -"remains unchanged."); +"Returns the new size."); PyDoc_STRVAR(StringIO_close_doc, "close() -> None. Close the file and release the resources held."); @@ -529,20 +528,22 @@ "Note that newlines are not added. The sequence can be any iterable object\n" "producing strings. This is equivalent to calling write() for each string."); +PyDoc_STRVAR(generic_true_doc, "Always True."); + static PyGetSetDef StringIO_getsetlist[] = { {"closed", (getter) string_io_get_closed, NULL, "True if the file is closed"}, - {"writeable", (getter) string_io_get_true, NULL, - "Always True."}, - {"readable", (getter) string_io_get_true, NULL, - "Always True."}, - {"seekable", (getter) string_io_get_true, NULL, - "Always True."}, {0}, /* sentinel */ }; static struct PyMethodDef StringIO_methods[] = { + {"readable", (PyCFunction) generic_true, METH_NOARGS, + generic_true_doc}, + {"seekable", (PyCFunction) generic_true, METH_NOARGS, + generic_true_doc}, + {"writable", (PyCFunction) generic_true, METH_NOARGS, + generic_true_doc}, {"flush", (PyCFunction) string_io_flush, METH_NOARGS, StringIO_flush_doc}, {"getvalue", (PyCFunction) string_io_getvalue, METH_VARARGS,

1 0

r56001 - python/trunk/Doc/howto/unicode.rst
by andrew.kuchling 15 Jun '07

15 Jun '07

Author: andrew.kuchling Date: Sat Jun 16 00:43:03 2007 New Revision: 56001 Modified: python/trunk/Doc/howto/unicode.rst Log: Add a word Modified: python/trunk/Doc/howto/unicode.rst ============================================================================== --- python/trunk/Doc/howto/unicode.rst (original) +++ python/trunk/Doc/howto/unicode.rst Sat Jun 16 00:43:03 2007 @@ -152,7 +152,7 @@ 4. Many Internet standards are defined in terms of textual data, and can't handle content with embedded zero bytes. -Generally people don't use this encoding, choosing other encodings +Generally people don't use this encoding, instead choosing other encodings that are more efficient and convenient. Encodings don't have to handle every possible Unicode character, and

1 0

r56000 - sandbox/trunk/pep0/NOTES
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Sat Jun 16 00:30:02 2007 New Revision: 56000 Modified: sandbox/trunk/pep0/NOTES Log: Update notes based on the fact that empty PEPs no longer exist. Modified: sandbox/trunk/pep0/NOTES ============================================================================== --- sandbox/trunk/pep0/NOTES (original) +++ sandbox/trunk/pep0/NOTES Sat Jun 16 00:30:02 2007 @@ -27,9 +27,6 @@ - Meta-PEPs are not delineated as such (e.g., usually specified as Informative). - + Status field. - - Empty PEPs are not specified as such. - * In the index: * Counting gap in numerical index and a newline.

1 0

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

15 Jun '07

Author: brett.cannon Date: Sat Jun 16 00:29:17 2007 New Revision: 55999 Modified: sandbox/trunk/pep0/pep0/output.py sandbox/trunk/pep0/pep0/pep.py Log: Add support for replaced PEPs. This also led to tightening up error reporting when sorting PEPs if the PEP couldn't be sorted. That led to tweaking the sort algorithm. Modified: sandbox/trunk/pep0/pep0/output.py ============================================================================== --- sandbox/trunk/pep0/pep0/output.py (original) +++ sandbox/trunk/pep0/pep0/output.py Sat Jun 16 00:29:17 2007 @@ -34,16 +34,19 @@ if pep.status == 'Draft': open_.append(pep) elif pep.status in ('Rejected', 'Withdrawn', 'Deferred', - 'Incomplete'): + 'Incomplete', 'Replaced'): dead.append(pep) elif pep.type_ == 'Process': meta.append(pep) elif pep.type_ == 'Informational': info.append(pep) - elif pep.status == 'Accepted': + elif pep.status in ('Accepted', 'Active'): accepted.append(pep) elif pep.status == 'Final': finished.append(pep) + else: + raise ValueError("PEP %s unsorted (%s/%s)" % (pep.number, + pep.type_, pep.status)) return meta, info, accepted, open_, finished, dead Modified: sandbox/trunk/pep0/pep0/pep.py ============================================================================== --- sandbox/trunk/pep0/pep0/pep.py (original) +++ sandbox/trunk/pep0/pep0/pep.py Sat Jun 16 00:29:17 2007 @@ -30,7 +30,7 @@ type_values = ("Standards Track", "Informational", "Process") # Active and Draft are not listed in the index. status_values = ("Accepted", "Rejected", "Withdrawn", "Deferred", "Final", - "Active", "Draft") + "Active", "Draft", "Replaced") # XXX Uncomment to valid author names (along with code in __init__). #valid_authors = set(x[0] for x in constants.email_addresses)

1 0

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

15 Jun '07

Author: brett.cannon Date: Sat Jun 16 00:22:23 2007 New Revision: 55998 Modified: sandbox/trunk/pep0/pep0/output.py Log: Remove empty PEPs as they no longer are valid. Modified: sandbox/trunk/pep0/pep0/output.py ============================================================================== --- sandbox/trunk/pep0/pep0/output.py (original) +++ sandbox/trunk/pep0/pep0/output.py Sat Jun 16 00:22:23 2007 @@ -20,14 +20,13 @@ def sort_peps(peps): - """Sort PEPs into meta, informational, accepted, open, finished, empty, + """Sort PEPs into meta, informational, accepted, open, finished, and essentially dead.""" meta = [] info = [] accepted = [] open_ = [] finished = [] - empty = [] dead = [] for pep in peps: # Order of 'if' statement important. Key Status values take precedence @@ -45,7 +44,7 @@ accepted.append(pep) elif pep.status == 'Final': finished.append(pep) - return meta, info, accepted, open_, finished, empty, dead + return meta, info, accepted, open_, finished, dead def write_pep0(peps, output=stdout): @@ -57,7 +56,7 @@ print>>output, "Index by Category" print>>output write_column_headers(output) - meta, info, accepted, open_, finished, empty, dead = sort_peps(peps) + meta, info, accepted, open_, finished, dead = sort_peps(peps) print>>output print>>output, " Meta-PEPs (PEPs about PEPs or Processs)" print>>output @@ -84,11 +83,6 @@ for pep in finished: print>>output, pep print>>output - print>>output, " Empty PEPs (or containing only abstract)" - print>>output - for pep in empty: - print>>output, pep - print>>output print>>output, " Deferred, Abandoned, Withdrawn, and Rejected PEPs" print>>output for pep in dead:

1 0

r55997 - peps/trunk/pep-0000.txt peps/trunk/pep-0210.txt peps/trunk/pep-0220.txt
by brett.cannon 15 Jun '07

15 Jun '07

Author: brett.cannon Date: Fri Jun 15 23:37:20 2007 New Revision: 55997 Modified: peps/trunk/pep-0000.txt peps/trunk/pep-0210.txt peps/trunk/pep-0220.txt Log: Reject long-standing empty PEPs. Also allows for the removal of the empty PEP section from the categorical index. Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Fri Jun 15 23:37:20 2007 @@ -178,22 +178,19 @@ SF 3129 Class Decorators Winter SF 3132 Extended Iterable Unpacking Brandl - Empty PEPs (or containing only an abstract) - - SD 210 Decoupling the Interpreter Loop Ascher - ID 220 Coroutines, Generators, Continuations McMillan - Deferred, Abandoned, Withdrawn, and Rejected PEPs SR 204 Range Literals Wouters IW 206 Python Advanced Library Kuchling SW 209 Adding Multidimensional Arrays Barrett, Oliphant + SR 210 Decoupling the Interpreter Loop Ascher SD 211 Adding A New Outer Product Operator Wilson SD 212 Loop Counter Iteration Schneider-Kamp SD 213 Attribute Access Handlers Prescod SR 215 String Interpolation Yee IR 216 Docstring Format Zadka SD 219 Stackless Python McMillan + IR 220 Coroutines, Generators, Continuations McMillan SD 222 Web Library Enhancements Kuchling SR 224 Attribute Docstrings Lemburg SD 225 Elementwise/Objectwise Operators Zhu, Lielens @@ -309,7 +306,7 @@ SF 207 Rich Comparisons GvR, Ascher SF 208 Reworking the Coercion Model Schemenauer, Lemburg SW 209 Adding Multidimensional Arrays Barrett, Oliphant - SD 210 Decoupling the Interpreter Loop Ascher + SR 210 Decoupling the Interpreter Loop Ascher SD 211 Adding A New Outer Product Operator Wilson SD 212 Loop Counter Iteration Schneider-Kamp SD 213 Attribute Access Handlers Prescod @@ -319,7 +316,7 @@ SF 217 Display Hook for Interactive Use Zadka SF 218 Adding a Built-In Set Object Type Wilson, Hettinger SD 219 Stackless Python McMillan - ID 220 Coroutines, Generators, Continuations McMillan + IR 220 Coroutines, Generators, Continuations McMillan SF 221 Import As Wouters SD 222 Web Library Enhancements Kuchling SF 223 Change the Meaning of \x Escapes Peters Modified: peps/trunk/pep-0210.txt ============================================================================== --- peps/trunk/pep-0210.txt (original) +++ peps/trunk/pep-0210.txt Fri Jun 15 23:37:20 2007 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: davida(a)activestate.com (David Ascher) -Status: Deferred +Status: Rejected Type: Standards Track Python-Version: 2.1 Created: 15-Jul-2000 Modified: peps/trunk/pep-0220.txt ============================================================================== --- peps/trunk/pep-0220.txt (original) +++ peps/trunk/pep-0220.txt Fri Jun 15 23:37:20 2007 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: gmcm(a)hypernet.com (Gordon McMillan) -Status: Active +Status: Rejected Type: Informational Created: 14-Aug-2000 Post-History:

1 0