Mailman 3 May 2012 - Python-checkins

Re: [Python-checkins] cpython: pyexpat uses the new Unicode API
by Amaury Forgeot d'Arc 29 Jul '12

29 Jul '12

> changeset: 72548:a1be34457ccf > user: Victor Stinner <victor.stinner at haypocalc.com> > date: Sat Oct 01 01:05:40 2011 +0200 > summary: > pyexat uses the new Unicode API > > files: > Modules/pyexpat.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > > diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c > --- a/Modules/pyexpat.c > +++ b/Modules/pyexpat.c > @@ -1234,11 +1234,13 @@ > static PyObject * > xmlparse_getattro(xmlparseobject *self, PyObject *nameobj) > { > - const Py_UNICODE *name; > + Py_UCS4 first_char; > int handlernum = -1; > > if (!PyUnicode_Check(nameobj)) > goto generic; > + if (PyUnicode_READY(nameobj)) > + return NULL; Why is this PyUnicode_READY necessary? Can tp_getattro pass unfinished unicode objects? I hope we don't have to update all extension modules? -- Amaury Forgeot d'Arc

2 1

cpython: #14814: Remove stale __hex__ method from ipaddress
by hynek.schlawack 31 May '12

31 May '12

http://hg.python.org/cpython/rev/bd2c2def77a7 changeset: 77274:bd2c2def77a7 user: Hynek Schlawack <hs(a)ox.cx> date: Fri Jun 01 00:20:13 2012 +0200 summary: #14814: Remove stale __hex__ method from ipaddress Obsolete 2.x method. files: Lib/ipaddress.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -482,9 +482,6 @@ def __int__(self): return self._ip - def __hex__(self): - return hex(self._ip) - def __eq__(self, other): try: return (self._ip == other._ip -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Don't use metaclasses when class decorators can do the job.
by r.david.murray 31 May '12

31 May '12

http://hg.python.org/cpython/rev/01b72be1ce0c changeset: 77273:01b72be1ce0c user: R David Murray <rdmurray(a)bitdance.com> date: Thu May 31 18:00:45 2012 -0400 summary: Don't use metaclasses when class decorators can do the job. Thanks to Nick Coghlan for pointing out that I'd forgotten about class decorators. files: Lib/email/_policybase.py | 39 ++--- Lib/email/policy.py | 3 +- Lib/test/test_email/__init__.py | 66 ++++----- Lib/test/test_email/test_generator.py | 5 +- Lib/test/test_email/test_headerregistry.py | 5 +- Lib/test/test_email/test_pickleable.py | 9 +- 6 files changed, 63 insertions(+), 64 deletions(-) diff --git a/Lib/email/_policybase.py b/Lib/email/_policybase.py --- a/Lib/email/_policybase.py +++ b/Lib/email/_policybase.py @@ -91,31 +91,25 @@ return self.clone(**other.__dict__) -# Conceptually this isn't a subclass of ABCMeta, but since we want Policy to -# use ABCMeta as a metaclass *and* we want it to use this one as well, we have -# to make this one a subclas of ABCMeta. -class _DocstringExtenderMetaclass(abc.ABCMeta): +def _append_doc(doc, added_doc): + doc = doc.rsplit('\n', 1)[0] + added_doc = added_doc.split('\n', 1)[1] + return doc + '\n' + added_doc - def __new__(meta, classname, bases, classdict): - if classdict.get('__doc__') and classdict['__doc__'].startswith('+'): - classdict['__doc__'] = meta._append_doc(bases[0].__doc__, - classdict['__doc__']) - for name, attr in classdict.items(): - if attr.__doc__ and attr.__doc__.startswith('+'): - for cls in (cls for base in bases for cls in base.mro()): - doc = getattr(getattr(cls, name), '__doc__') - if doc: - attr.__doc__ = meta._append_doc(doc, attr.__doc__) - break - return super().__new__(meta, classname, bases, classdict) +def _extend_docstrings(cls): + if cls.__doc__ and cls.__doc__.startswith('+'): + cls.__doc__ = _append_doc(cls.__bases__[0].__doc__, cls.__doc__) + for name, attr in cls.__dict__.items(): + if attr.__doc__ and attr.__doc__.startswith('+'): + for c in (c for base in cls.__bases__ for c in base.mro()): + doc = getattr(getattr(c, name), '__doc__') + if doc: + attr.__doc__ = _append_doc(doc, attr.__doc__) + break + return cls - @staticmethod - def _append_doc(doc, added_doc): - added_doc = added_doc.split('\n', 1)[1] - return doc + '\n' + added_doc - -class Policy(_PolicyBase, metaclass=_DocstringExtenderMetaclass): +class Policy(_PolicyBase, metaclass=abc.ABCMeta): r"""Controls for how messages are interpreted and formatted. @@ -264,6 +258,7 @@ raise NotImplementedError +@_extend_docstrings class Compat32(Policy): """+ diff --git a/Lib/email/policy.py b/Lib/email/policy.py --- a/Lib/email/policy.py +++ b/Lib/email/policy.py @@ -2,7 +2,7 @@ code that adds all the email6 features. """ -from email._policybase import Policy, Compat32, compat32 +from email._policybase import Policy, Compat32, compat32, _extend_docstrings from email.utils import _has_surrogates from email.headerregistry import HeaderRegistry as HeaderRegistry @@ -17,6 +17,7 @@ 'HTTP', ] +@_extend_docstrings class EmailPolicy(Policy): """+ diff --git a/Lib/test/test_email/__init__.py b/Lib/test/test_email/__init__.py --- a/Lib/test/test_email/__init__.py +++ b/Lib/test/test_email/__init__.py @@ -73,10 +73,8 @@ 'item {}'.format(i)) -# Metaclass to allow for parameterized tests -class Parameterized(type): - - """Provide a test method parameterization facility. +def parameterize(cls): + """A test method parameterization class decorator. Parameters are specified as the value of a class attribute that ends with the string '_params'. Call the portion before '_params' the prefix. Then @@ -92,9 +90,10 @@ In a _params dictioanry, the keys become part of the name of the generated tests. In a _params list, the values in the list are converted into a string by joining the string values of the elements of the tuple by '_' and - converting any blanks into '_'s, and this become part of the name. The - full name of a generated test is the portion of the _params name before the - '_params' portion, plus an '_', plus the name derived as explained above. + converting any blanks into '_'s, and this become part of the name. + The full name of a generated test is a 'test_' prefix, the portion of the + test function name after the '_as_' separator, plus an '_', plus the name + derived as explained above. For example, if we have: @@ -123,30 +122,29 @@ be used to select the test individually from the unittest command line. """ - - def __new__(meta, classname, bases, classdict): - paramdicts = {} - for name, attr in classdict.items(): - if name.endswith('_params'): - if not hasattr(attr, 'keys'): - d = {} - for x in attr: - if not hasattr(x, '__iter__'): - x = (x,) - n = '_'.join(str(v) for v in x).replace(' ', '_') - d[n] = x - attr = d - paramdicts[name[:-7] + '_as_'] = attr - testfuncs = {} - for name, attr in classdict.items(): - for paramsname, paramsdict in paramdicts.items(): - if name.startswith(paramsname): - testnameroot = 'test_' + name[len(paramsname):] - for paramname, params in paramsdict.items(): - test = (lambda self, name=name, params=params: - getattr(self, name)(*params)) - testname = testnameroot + '_' + paramname - test.__name__ = testname - testfuncs[testname] = test - classdict.update(testfuncs) - return super().__new__(meta, classname, bases, classdict) + paramdicts = {} + for name, attr in cls.__dict__.items(): + if name.endswith('_params'): + if not hasattr(attr, 'keys'): + d = {} + for x in attr: + if not hasattr(x, '__iter__'): + x = (x,) + n = '_'.join(str(v) for v in x).replace(' ', '_') + d[n] = x + attr = d + paramdicts[name[:-7] + '_as_'] = attr + testfuncs = {} + for name, attr in cls.__dict__.items(): + for paramsname, paramsdict in paramdicts.items(): + if name.startswith(paramsname): + testnameroot = 'test_' + name[len(paramsname):] + for paramname, params in paramsdict.items(): + test = (lambda self, name=name, params=params: + getattr(self, name)(*params)) + testname = testnameroot + '_' + paramname + test.__name__ = testname + testfuncs[testname] = test + for key, value in testfuncs.items(): + setattr(cls, key, value) + return cls diff --git a/Lib/test/test_email/test_generator.py b/Lib/test/test_email/test_generator.py --- a/Lib/test/test_email/test_generator.py +++ b/Lib/test/test_email/test_generator.py @@ -4,10 +4,11 @@ from email import message_from_string, message_from_bytes from email.generator import Generator, BytesGenerator from email import policy -from test.test_email import TestEmailBase, Parameterized +from test.test_email import TestEmailBase, parameterize -class TestGeneratorBase(metaclass=Parameterized): +@parameterize +class TestGeneratorBase: policy = policy.default diff --git a/Lib/test/test_email/test_headerregistry.py b/Lib/test/test_email/test_headerregistry.py --- a/Lib/test/test_email/test_headerregistry.py +++ b/Lib/test/test_email/test_headerregistry.py @@ -4,7 +4,7 @@ from email import errors from email import policy from email.message import Message -from test.test_email import TestEmailBase, Parameterized +from test.test_email import TestEmailBase, parameterize from email import headerregistry from email.headerregistry import Address, Group @@ -175,7 +175,8 @@ self.assertEqual(m['Date'].datetime, self.dt) -class TestAddressHeader(TestHeaderBase, metaclass=Parameterized): +@parameterize +class TestAddressHeader(TestHeaderBase): example_params = { diff --git a/Lib/test/test_email/test_pickleable.py b/Lib/test/test_email/test_pickleable.py --- a/Lib/test/test_email/test_pickleable.py +++ b/Lib/test/test_email/test_pickleable.py @@ -6,9 +6,11 @@ import email.message from email import policy from email.headerregistry import HeaderRegistry -from test.test_email import TestEmailBase, Parameterized +from test.test_email import TestEmailBase, parameterize -class TestPickleCopyHeader(TestEmailBase, metaclass=Parameterized): + +@parameterize +class TestPickleCopyHeader(TestEmailBase): header_factory = HeaderRegistry() @@ -33,7 +35,8 @@ self.assertEqual(str(h), str(header)) -class TestPickleCopyMessage(TestEmailBase, metaclass=Parameterized): +@parameterize +class TestPickleCopyMessage(TestEmailBase): # Message objects are a sequence, so we have to make them a one-tuple in # msg_params so they get passed to the parameterized test method as a -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Post-release update.
by georg.brandl 31 May '12

31 May '12

http://hg.python.org/cpython/rev/56cc9de5c024 changeset: 77272:56cc9de5c024 user: Georg Brandl <georg(a)python.org> date: Thu May 31 22:41:51 2012 +0200 summary: Post-release update. files: Include/patchlevel.h | 2 +- Misc/NEWS | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -23,7 +23,7 @@ #define PY_RELEASE_SERIAL 4 /* Version as a string */ -#define PY_VERSION "3.3.0a4" +#define PY_VERSION "3.3.0a4+" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3,9 +3,9 @@ +++++++++++ What's New in Python 3.3.0 Beta 1? -=================================== - -*Release date: TBD* +================================== + +*Release date: XX-XXX-2012* Library ------- @@ -22,6 +22,7 @@ - Issue #14963 (partial): Add test cases for exception handling behaviour in contextlib.ExitStack (Initial patch by Alon Horev) + What's New in Python 3.3.0 Alpha 4? =================================== -- Repository URL: http://hg.python.org/cpython

1 0

cpython: VS 2010 has the AMD64 redist files in VC\redist\x64.
by martin.v.loewis 31 May '12

31 May '12

http://hg.python.org/cpython/rev/7528b178692e changeset: 77271:7528b178692e user: Martin v. Löwis <martin(a)v.loewis.de> date: Thu May 31 21:58:21 2012 +0200 summary: VS 2010 has the AMD64 redist files in VC\redist\x64. files: Tools/msi/msi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -875,7 +875,7 @@ def extract_msvcr100(): # Find the redistributable files if msilib.Win64: - arch = "amd64" + arch = "x64" else: arch = "x86" dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100.CRT" % arch) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Update to Tcl/Tk 8.5.11.
by martin.v.loewis 31 May '12

31 May '12

http://hg.python.org/cpython/rev/99786479dafb changeset: 77270:99786479dafb user: Martin v. Löwis <martin(a)v.loewis.de> date: Thu May 31 21:53:36 2012 +0200 summary: Update to Tcl/Tk 8.5.11. files: PCbuild/build_tkinter.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PCbuild/build_tkinter.py b/PCbuild/build_tkinter.py --- a/PCbuild/build_tkinter.py +++ b/PCbuild/build_tkinter.py @@ -11,8 +11,8 @@ here = os.path.abspath(os.path.dirname(__file__)) par = os.path.pardir -TCL = "tcl8.5.9" -TK = "tk8.5.9" +TCL = "tcl8.5.11" +TK = "tk8.5.11" TIX = "tix-8.4.3.x" ROOT = os.path.abspath(os.path.join(here, par, par)) @@ -32,7 +32,7 @@ def build(platform, clean): if platform == "Win32": dest = os.path.join(ROOT, "tcltk") - machine = "X86" + machine = "IX86" elif platform == "AMD64": dest = os.path.join(ROOT, "tcltk64") machine = "AMD64" -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Use workctx instead of ctx for cosmetic reasons. Also zero-pad the result
by stefan.krah 31 May '12

31 May '12

http://hg.python.org/cpython/rev/fb79cf1d21c9 changeset: 77269:fb79cf1d21c9 user: Stefan Krah <skrah(a)bytereef.org> date: Thu May 31 20:49:24 2012 +0200 summary: Use workctx instead of ctx for cosmetic reasons. Also zero-pad the result in the simple path (not correctly rounded but faster). files: Modules/_decimal/libmpdec/mpdecimal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c --- a/Modules/_decimal/libmpdec/mpdecimal.c +++ b/Modules/_decimal/libmpdec/mpdecimal.c @@ -4168,7 +4168,7 @@ if (mpd_isspecial(result) || mpd_iszerocoeff(result) || mpd_qcmp(&t1, &t2, status) == 0) { workctx.clamp = ctx->clamp; - _mpd_zeropad(result, ctx, status); + _mpd_zeropad(result, &workctx, status); mpd_check_underflow(result, &workctx, status); mpd_qfinalize(result, &workctx, status); break; @@ -4182,6 +4182,7 @@ } else { _mpd_qexp(result, a, &workctx, status); + _mpd_zeropad(result, &workctx, status); mpd_check_underflow(result, &workctx, status); mpd_qfinalize(result, &workctx, status); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Improve Underflow handling in the correct-rounding loop. The case for
by stefan.krah 31 May '12

31 May '12

http://hg.python.org/cpython/rev/fabc593a5822 changeset: 77268:fabc593a5822 user: Stefan Krah <skrah(a)bytereef.org> date: Thu May 31 20:01:05 2012 +0200 summary: Improve Underflow handling in the correct-rounding loop. The case for Underflow to zero hasn't changed: _mpd_qexp() internally uses MIN_EMIN, so the result would also underflow to zero for all emin > MIN_EMIN. In case digits are left, the informal argument is as follows: Underflow can occur only once in the last multiplication of the power stage (in the Horner stage Underflow provably cannot occur, and if Underflow occurred twice in the power stage, the result would underflow to zero on the second occasion). Since there is no double rounding during Underflow, the effective work precision is now 1 <= result->digits < prec. It can be shown by a somewhat tedious argument that abs(result - e**x) < ulp(result, result->digits). Therefore the correct rounding loop now uses ulp(result, result->digits) to generate the bounds for e**x in case of Underflow. files: Modules/_decimal/libmpdec/mpdecimal.c | 21 ++++++++++++-- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c --- a/Modules/_decimal/libmpdec/mpdecimal.c +++ b/Modules/_decimal/libmpdec/mpdecimal.c @@ -4122,6 +4122,8 @@ MPD_NEW_STATIC(ulp, 0,0,0,0); MPD_NEW_STATIC(aa, 0,0,0,0); mpd_ssize_t prec; + mpd_ssize_t ulpexp; + uint32_t workstatus; if (result == a) { if (!mpd_qcopy(&aa, a, status)) { @@ -4135,12 +4137,20 @@ prec = ctx->prec + 3; while (1) { workctx.prec = prec; - _mpd_qexp(result, a, &workctx, status); - _ssettriple(&ulp, MPD_POS, 1, - result->exp + result->digits-workctx.prec); + workstatus = 0; + + _mpd_qexp(result, a, &workctx, &workstatus); + *status |= workstatus; + + ulpexp = result->exp + result->digits - workctx.prec; + if (workstatus & MPD_Underflow) { + /* The effective work precision is result->digits. */ + ulpexp = result->exp; + } + _ssettriple(&ulp, MPD_POS, 1, ulpexp); /* - * At this point: + * At this point [1]: * 1) abs(result - e**x) < 0.5 * 10**(-prec) * e**x * 2) result - ulp < e**x < result + ulp * 3) result - ulp < result < result + ulp @@ -4148,6 +4158,9 @@ * If round(result-ulp)==round(result+ulp), then * round(result)==round(e**x). Therefore the result * is correctly rounded. + * + * [1] If abs(a) <= 9 * 10**(-prec-1), use the absolute + * error for a similar argument. */ workctx.prec = ctx->prec; mpd_qadd(&t1, result, &ulp, &workctx, &workctx.status); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #14962: merge
by ned.deily 31 May '12

31 May '12

http://hg.python.org/cpython/rev/86f62adb09cf changeset: 77267:86f62adb09cf parent: 77264:c7b16e2be71a parent: 77266:9d0c3a835bfe user: Ned Deily <nad(a)acm.org> date: Thu May 31 09:58:08 2012 -0700 summary: Issue #14962: merge files: Lib/idlelib/PyShell.py | 5 +++++ Misc/NEWS | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -309,6 +309,11 @@ "console": idleConf.GetHighlight(theme, "console"), }) + def removecolors(self): + # Don't remove shell color tags before "iomark" + for tag in self.tagdefs: + self.tag_remove(tag, "iomark", "end") + class ModifiedUndoDelegator(UndoDelegator): "Extend base class: forbid insert/delete before the I/O mark" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Library ------- +- Issue #14962: Update text coloring in IDLE shell window after changing + options. Patch by Roger Serwy. + - Issue #14963: Convert contextlib.ExitStack.__exit__ to use an iterative algorithm (Patch by Alon Horev) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #14962: Update text coloring in IDLE shell window after changing
by ned.deily 31 May '12

31 May '12

http://hg.python.org/cpython/rev/9d0c3a835bfe changeset: 77266:9d0c3a835bfe branch: 3.2 parent: 77254:a0023e779bce user: Ned Deily <nad(a)acm.org> date: Thu May 31 09:17:29 2012 -0700 summary: Issue #14962: Update text coloring in IDLE shell window after changing options. Patch by Roger Serwy. files: Lib/idlelib/PyShell.py | 5 +++++ Misc/NEWS | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -309,6 +309,11 @@ "console": idleConf.GetHighlight(theme, "console"), }) + def removecolors(self): + # Don't remove shell color tags before "iomark" + for tag in self.tagdefs: + self.tag_remove(tag, "iomark", "end") + class ModifiedUndoDelegator(UndoDelegator): "Extend base class: forbid insert/delete before the I/O mark" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -70,6 +70,9 @@ Library ------- +- Issue #14962: Update text coloring in IDLE shell window after changing + options. Patch by Roger Serwy. + - Issue #10997: Prevent a duplicate entry in IDLE's "Recent Files" menu. - Issue #14443: Tell rpmbuild to use the correct version of Python in -- Repository URL: http://hg.python.org/cpython

1 0