Mailman 3 May 2013 - Python-checkins

cpython (3.3): Backport bff16086f03b and bcaaaa00425b.
by stefan.krah May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/8a77d7019559 changeset: 83979:8a77d7019559 branch: 3.3 parent: 83974:9156c663d6aa user: Stefan Krah <skrah(a)bytereef.org> date: Wed May 29 19:14:17 2013 +0200 summary: Backport bff16086f03b and bcaaaa00425b. files: Lib/test/test_decimal.py | 13 +++++++++++++ Modules/_decimal/_decimal.c | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -5373,6 +5373,19 @@ x = (1, (0, 1), "N") self.assertEqual(str(Decimal(x)), '-sNaN1') + def test_sizeof(self): + Decimal = C.Decimal + HAVE_CONFIG_64 = (C.MAX_PREC > 425000000) + + self.assertGreater(Decimal(0).__sizeof__(), 0) + if HAVE_CONFIG_64: + x = Decimal(10**(19*24)).__sizeof__() + y = Decimal(10**(19*25)).__sizeof__() + self.assertEqual(y, x+8) + else: + x = Decimal(10**(9*24)).__sizeof__() + y = Decimal(10**(9*25)).__sizeof__() + self.assertEqual(y, x+4) all_tests = [ CExplicitConstructionTest, PyExplicitConstructionTest, diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -4469,10 +4469,10 @@ goto malloc_error; } else { - PyErr_SetString(PyExc_RuntimeError, - "dec_hash: internal error: please report"); + PyErr_SetString(PyExc_RuntimeError, /* GCOV_NOT_REACHED */ + "dec_hash: internal error: please report"); /* GCOV_NOT_REACHED */ } - result = -1; + result = -1; /* GCOV_NOT_REACHED */ } @@ -5623,7 +5623,7 @@ } if (base == NULL) { - goto error; + goto error; /* GCOV_NOT_REACHED */ } ASSIGN_PTR(cm->ex, PyErr_NewException((char *)cm->fqname, base, NULL)); @@ -5655,7 +5655,7 @@ base = PyTuple_Pack(1, signal_map[0].ex); } if (base == NULL) { - goto error; + goto error; /* GCOV_NOT_REACHED */ } ASSIGN_PTR(cm->ex, PyErr_NewException((char *)cm->fqname, base, NULL)); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Mark untestable lines for gcov.
by stefan.krah May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/bff16086f03b changeset: 83978:bff16086f03b user: Stefan Krah <skrah(a)bytereef.org> date: Wed May 29 19:08:34 2013 +0200 summary: Mark untestable lines for gcov. files: Modules/_decimal/_decimal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -4469,10 +4469,10 @@ goto malloc_error; } else { - PyErr_SetString(PyExc_RuntimeError, - "dec_hash: internal error: please report"); + PyErr_SetString(PyExc_RuntimeError, /* GCOV_NOT_REACHED */ + "dec_hash: internal error: please report"); /* GCOV_NOT_REACHED */ } - result = -1; + result = -1; /* GCOV_NOT_REACHED */ } @@ -5623,7 +5623,7 @@ } if (base == NULL) { - goto error; + goto error; /* GCOV_NOT_REACHED */ } ASSIGN_PTR(cm->ex, PyErr_NewException((char *)cm->fqname, base, NULL)); @@ -5655,7 +5655,7 @@ base = PyTuple_Pack(1, signal_map[0].ex); } if (base == NULL) { - goto error; + goto error; /* GCOV_NOT_REACHED */ } ASSIGN_PTR(cm->ex, PyErr_NewException((char *)cm->fqname, base, NULL)); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: test_decimal: add __sizeof__() tests for code coverage.
by stefan.krah May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/bcaaaa00425b changeset: 83977:bcaaaa00425b user: Stefan Krah <skrah(a)bytereef.org> date: Wed May 29 18:50:06 2013 +0200 summary: test_decimal: add __sizeof__() tests for code coverage. files: Lib/test/test_decimal.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -5372,6 +5372,19 @@ x = (1, (0, 1), "N") self.assertEqual(str(Decimal(x)), '-sNaN1') + def test_sizeof(self): + Decimal = C.Decimal + HAVE_CONFIG_64 = (C.MAX_PREC > 425000000) + + self.assertGreater(Decimal(0).__sizeof__(), 0) + if HAVE_CONFIG_64: + x = Decimal(10**(19*24)).__sizeof__() + y = Decimal(10**(19*25)).__sizeof__() + self.assertEqual(y, x+8) + else: + x = Decimal(10**(9*24)).__sizeof__() + y = Decimal(10**(9*25)).__sizeof__() + self.assertEqual(y, x+4) all_tests = [ CExplicitConstructionTest, PyExplicitConstructionTest, -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and
by serhiy.storchaka May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/0a45896a7cde changeset: 83976:0a45896a7cde user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed May 29 18:50:54 2013 +0300 summary: Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and PyObject_CallMethod() now changed to `const char*`. Based on patches by Jörg Müller and Lars Buitinck. files: Doc/c-api/object.rst | 10 ++++++++-- Doc/data/refcounts.dat | 8 ++++---- Include/abstract.h | 23 ++++++++++++++--------- Misc/ACKS | 2 ++ Misc/NEWS | 4 ++++ Objects/abstract.c | 17 ++++++++++------- 6 files changed, 42 insertions(+), 22 deletions(-) diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -240,7 +240,7 @@ of the Python expression ``callable_object(*args)``. -.. c:function:: PyObject* PyObject_CallFunction(PyObject *callable, char *format, ...) +.. c:function:: PyObject* PyObject_CallFunction(PyObject *callable, const char *format, ...) Call a callable Python object *callable*, with a variable number of C arguments. The C arguments are described using a :c:func:`Py_BuildValue` style format @@ -250,8 +250,11 @@ pass :c:type:`PyObject \*` args, :c:func:`PyObject_CallFunctionObjArgs` is a faster alternative. + .. versionchanged:: 3.4 + The type of *format* was changed from ``char *``. -.. c:function:: PyObject* PyObject_CallMethod(PyObject *o, char *method, char *format, ...) + +.. c:function:: PyObject* PyObject_CallMethod(PyObject *o, const char *method, const char *format, ...) Call the method named *method* of object *o* with a variable number of C arguments. The C arguments are described by a :c:func:`Py_BuildValue` format @@ -261,6 +264,9 @@ Note that if you only pass :c:type:`PyObject \*` args, :c:func:`PyObject_CallMethodObjArgs` is a faster alternative. + .. versionchanged:: 3.4 + The types of *method* and *format* were changed from ``char *``. + .. c:function:: PyObject* PyObject_CallFunctionObjArgs(PyObject *callable, ..., NULL) diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -218,7 +218,7 @@ PyDict_GetItemString:PyObject*::0: PyDict_GetItemString:PyObject*:p:0: -PyDict_GetItemString:char*:key:: +PyDict_GetItemString:const char*:key:: PyDict_SetDefault:PyObject*::0: PyDict_SetDefault:PyObject*:p:0: @@ -917,7 +917,7 @@ PyObject_CallFunction:PyObject*::+1: PyObject_CallFunction:PyObject*:callable_object:0: -PyObject_CallFunction:char*:format:: +PyObject_CallFunction:const char*:format:: PyObject_CallFunction::...:: PyObject_CallFunctionObjArgs:PyObject*::+1: @@ -926,8 +926,8 @@ PyObject_CallMethod:PyObject*::+1: PyObject_CallMethod:PyObject*:o:0: -PyObject_CallMethod:char*:m:: -PyObject_CallMethod:char*:format:: +PyObject_CallMethod:const char*:m:: +PyObject_CallMethod:const char*:format:: PyObject_CallMethod::...:: PyObject_CallMethodObjArgs:PyObject*::+1: diff --git a/Include/abstract.h b/Include/abstract.h --- a/Include/abstract.h +++ b/Include/abstract.h @@ -284,7 +284,7 @@ */ PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object, - char *format, ...); + const char *format, ...); /* Call a callable Python object, callable_object, with a @@ -296,8 +296,9 @@ */ - PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, char *method, - char *format, ...); + PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, + const char *method, + const char *format, ...); /* Call the method named m of object o with a variable number of @@ -308,8 +309,9 @@ Python expression: o.method(args). */ - PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o, _Py_Identifier *method, - char *format, ...); + PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o, + _Py_Identifier *method, + const char *format, ...); /* Like PyObject_CallMethod, but expect a _Py_Identifier* as the @@ -317,13 +319,16 @@ */ PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, - char *format, ...); + const char *format, + ...); PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, - char *name, - char *format, ...); + const char *name, + const char *format, + ...); PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, - char *format, ...); + const char *format, + ...); PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, ...); diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -174,6 +174,7 @@ Stan Bubrouski Erik de Bueger Jan-Hein Bührman +Lars Buitinck Dick Bulterman Bill Bumgarner Jimmy Burgett @@ -872,6 +873,7 @@ Louis Munro R. David Murray Matti Mäki +Jörg Müller Dale Nagata John Nagle Takahiro Nakayama diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -387,6 +387,10 @@ C-API ----- +- Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and + PyObject_CallMethod() now changed to `const char*`. Based on patches by + Jörg Müller and Lars Buitinck. + - Issue #17206: Py_CLEAR(), Py_DECREF(), Py_XINCREF() and Py_XDECREF() now expand their arguments once instead of multiple times. Patch written by Illia Polosukhin. diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2142,7 +2142,7 @@ } PyObject * -PyObject_CallFunction(PyObject *callable, char *format, ...) +PyObject_CallFunction(PyObject *callable, const char *format, ...) { va_list va; PyObject *args; @@ -2162,7 +2162,7 @@ } PyObject * -_PyObject_CallFunction_SizeT(PyObject *callable, char *format, ...) +_PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...) { va_list va; PyObject *args; @@ -2182,7 +2182,7 @@ } static PyObject* -callmethod(PyObject* func, char *format, va_list va, int is_size_t) +callmethod(PyObject* func, const char *format, va_list va, int is_size_t) { PyObject *retval = NULL; PyObject *args; @@ -2211,7 +2211,7 @@ } PyObject * -PyObject_CallMethod(PyObject *o, char *name, char *format, ...) +PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) { va_list va; PyObject *func = NULL; @@ -2232,7 +2232,8 @@ } PyObject * -_PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, char *format, ...) +_PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, + const char *format, ...) { va_list va; PyObject *func = NULL; @@ -2253,7 +2254,8 @@ } PyObject * -_PyObject_CallMethod_SizeT(PyObject *o, char *name, char *format, ...) +_PyObject_CallMethod_SizeT(PyObject *o, const char *name, + const char *format, ...) { va_list va; PyObject *func = NULL; @@ -2273,7 +2275,8 @@ } PyObject * -_PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, char *format, ...) +_PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, + const char *format, ...) { va_list va; PyObject *func = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

peps: Markup fixes
by nick.coghlan May 29, 2013

May 29, 2013

http://hg.python.org/peps/rev/1d2c0597e55c changeset: 4917:1d2c0597e55c user: Nick Coghlan <ncoghlan(a)gmail.com> date: Thu May 30 00:17:27 2013 +1000 summary: Markup fixes files: pep-0426.txt | 2 +- pep-0440.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -1754,7 +1754,7 @@ Changes to environment markers ------------------------------ -There are three substantive changes to environment markers in this version:: +There are three substantive changes to environment markers in this version: * ``platform_release`` was added, as it provides more useful information than ``platform_version`` on at least Linux and Mac OS X (specifically, diff --git a/pep-0440.txt b/pep-0440.txt --- a/pep-0440.txt +++ b/pep-0440.txt @@ -854,7 +854,7 @@ Adding source labels -------------------- +-------------------- The new source label support is intended to make it clearer that the constraints on public version identifiers are there primarily to aid in -- Repository URL: http://hg.python.org/peps

1 0

peps: Update based on distutils-sig feedback
by nick.coghlan May 29, 2013

May 29, 2013

http://hg.python.org/peps/rev/a561f851473c changeset: 4916:a561f851473c user: Nick Coghlan <ncoghlan(a)gmail.com> date: Thu May 30 00:15:30 2013 +1000 summary: Update based on distutils-sig feedback files: pep-0426.txt | 232 ++++++++++++++++++++++++-------------- pep-0440.txt | 110 +++++++---------- 2 files changed, 192 insertions(+), 150 deletions(-) diff --git a/pep-0426.txt b/pep-0426.txt --- a/pep-0426.txt +++ b/pep-0426.txt @@ -310,11 +310,11 @@ * ``version_url`` * ``extras`` * ``requires`` -* ``may-require`` -* ``build-requires`` -* ``build-may-require`` -* ``dev-requires`` -* ``dev-may-require`` +* ``may_require`` +* ``build_requires`` +* ``build_may_require`` +* ``dev_requires`` +* ``dev_may_require`` * ``provides`` * ``obsoleted_by`` * ``supports_environments`` @@ -474,49 +474,49 @@ "version": "1.0a2" -Additional identifying metadata -=============================== - -This section specifies fields that provide other identifying details -that are unique to this distribution. +Source code metadata +==================== + +This section specifies fields that provide identifying details for the +source code used to produce this distribution. All of these fields are optional. Automated tools MUST operate correctly if a distribution does not provide them, including failing cleanly when an operation depending on one of these fields is requested. -Build label ------------ - -A constrained identifying text string, as defined in PEP 440. Build labels +Source label +------------ + +A constrained identifying text string, as defined in PEP 440. Source labels cannot be used in ordered version comparisons, but may be used to select an exact version (see PEP 440 for details). Examples:: - "build_label": "1.0.0-alpha.1" - - "build_label": "1.3.7+build.11.e0f985a" - - "build_label": "v1.8.1.301.ga0df26f" - - "build_label": "2013.02.17.dev123" - - -Version URL ------------ - -A string containing a full URL where this specific version of the -distribution can be downloaded. (This means that the URL can't be + "source_label": "1.0.0-alpha.1" + + "source_label": "1.3.7+build.11.e0f985a" + + "source_label": "v1.8.1.301.ga0df26f" + + "source_label": "2013.02.17.dev123" + + +Source URL +---------- + +A string containing a full URL where the source for this specific version of +the distribution can be downloaded. (This means that the URL can't be something like ``"https://github.com/pypa/pip/archive/master.zip"``, but instead must be ``"https://github.com/pypa/pip/archive/1.3.1.zip"``.) -Some appropriate targets for a version URL are a source tarball, an sdist +Some appropriate targets for a source URL are a source tarball, an sdist archive or a direct reference to a tag or specific commit in an online version control system. -All version URL references SHOULD either specify a secure transport +All source URL references SHOULD either specify a secure transport mechanism (such as ``https``) or else include an expected hash value in the URL for verification purposes. If an insecure transport is specified without any hash information (or with hash information that the tool doesn't @@ -542,9 +542,9 @@ Example:: - "version_url": "https://github.com/pypa/pip/archive/1.3.1.zip" - "version_url": "http://github.com/pypa/pip/archive/1.3.1.zip#sha1=da9234ee9982d4bbb3c72346a…" - "version_url": "git+https://github.com/pypa/pip.git@1.3.1" + "source_url": "https://github.com/pypa/pip/archive/1.3.1.zip" + "source_url": "http://github.com/pypa/pip/archive/1.3.1.zip#sha1=da9234ee9982d4bbb3c72346a…" + "source_url": "git+https://github.com/pypa/pip.git@1.3.1" .. note:: @@ -709,10 +709,10 @@ ] -Contact metadata -================ - -Contact metadata for a distribution is provided to allow users to get +Contributor metadata +==================== + +Contributor metadata for a distribution is provided to allow users to get access to more information about the distribution and its maintainers. These details are recorded as mappings with the following subfields: @@ -720,42 +720,39 @@ * ``name``: the name of an individual or group * ``email``: an email address (this may be a mailing list) * ``url``: a URL (such as a profile page on a source code hosting service) -* ``type``: one of ``"author"``, ``"maintainer"``, ``"organization"`` - or ``"individual"`` +* ``role``: one of ``"author"``, ``"maintainer"`` or ``"contributor"`` The ``name`` subfield is required, the other subfields are optional. -If no specific contact type is stated, the default is ``individual``. - -The different contact types are as follows: +If no specific role is stated, the default is ``contributor``. + +The defined contributor roles are as follows: * ``author``: the original creator of a distribution * ``maintainer``: the current lead contributor for a distribution, when they are not the original creator -* ``individual``: any other individuals involved in the creation of the - distribution -* ``organization``: indicates that these contact details are for an - organization (formal or informal) rather than for a specific individual +* ``contributor``: any other individuals or organizations involved in the + creation of the distribution .. note:: - This is admittedly a little complicated, but it's designed to replace the + The contributor role field is included primarily to replace the Author, Author-Email, Maintainer, Maintainer-Email fields from metadata 1.2 in a way that allows those distinctions to be fully represented for lossless translation, while allowing future distributions to pretty much ignore everything other than the contact/contributor distinction if they so choose. -Contact metadata is optional. Automated tools MUST operate correctly if -a distribution does not provide them, including failing cleanly when an -operation depending on one of these fields is requested. +Contact and contributor metadata is optional. Automated tools MUST operate +correctly if a distribution does not provide it, including failing cleanly +when an operation depending on one of these fields is requested. Contacts -------- -A list of contact entries giving the recommended contact points for getting -more information about the project. +A list of contributor entries giving the recommended contact points for +getting more information about the project. The example below would be suitable for a project that was in the process of handing over from the original author to a new lead maintainer, while @@ -766,18 +763,17 @@ "contacts": [ { "name": "Python Packaging Authority/Distutils-SIG", - "type": "organization", "email": "distutils-sig(a)python.org", "url": "https://bitbucket.org/pypa/" }, { "name": "Samantha C.", - "type": "maintainer", + "role": "maintainer", "email": "dontblameme(a)example.org" }, { "name": "Charlotte C.", - "type": "author", + "role": "author", "email": "iambecomingasketchcomedian(a)example.com" } ] @@ -786,7 +782,7 @@ Contributors ------------ -A list of contact entries for other contributors not already listed as +A list of contributor entries for other contributors not already listed as current project points of contact. The subfields within the list elements are the same as those for the main contact field. @@ -821,7 +817,7 @@ "project_urls": { "Documentation": "https://distlib.readthedocs.org" "Home": "https://bitbucket.org/pypa/distlib" - "Source": "https://bitbucket.org/pypa/distlib/src" + "Repository": "https://bitbucket.org/pypa/distlib/src" "Tracker": "https://bitbucket.org/pypa/distlib/issues" } @@ -842,9 +838,10 @@ model in metadata 1.2 (which was in turn derived from the setuptools dependency parameters). The translation is that ``dev_requires`` and ``build_requires`` both map to ``Setup-Requires-Dist`` - in 1.2, while ``requires`` maps to ``Requires-Dist``. To go the other - way, ``Setup-Requires-Dist`` maps to ``build_requires`` and - ``Requires-Dist`` maps to ``requires``. + in 1.2, while ``requires`` and ``distributes`` map to ``Requires-Dist``. + To go the other way, ``Setup-Requires-Dist`` maps to ``build_requires`` + and ``Requires-Dist`` maps to ``distributes`` (for exact comparisons) + and ``requires`` (for all other version specifiers). All of these fields are optional. Automated tools MUST operate correctly if a distribution does not provide them, by assuming that a missing field @@ -923,6 +920,7 @@ * Deployment dependencies: + * ``distributes`` * ``requires`` * ``may_require`` * Request the ``test`` extra to also install @@ -937,6 +935,7 @@ * Development dependencies: + * ``distributes`` * ``requires`` * ``may_require`` * ``build_requires`` @@ -946,6 +945,7 @@ * ``dev_requires`` * ``dev_may_require`` + To ease compatibility with existing two phase setup/deployment toolchains, installation tools MAY treat ``dev_requires`` and ``dev_may_require`` as additions to ``build_requires`` and ``build_may_require`` rather than @@ -958,6 +958,8 @@ * Install just the build dependencies without installing the distribution * Install just the development dependencies without installing the distribution +* Install just the development dependencies without installing + the distribution or any dependencies listed in ``distributes`` The notation described in `Extras (optional dependencies)`_ SHOULD be used to request additional optional dependencies when installing deployment @@ -973,10 +975,10 @@ example project without any extras defined is split into 2 RPMs in a SPEC file: example and example-devel - The ``requires`` and applicable ``may_require`` dependencies would be - mapped to the Requires dependencies for the "example" RPM (a mapping from - environment markers to SPEC file conditions would also allow those to - be handled correctly) + The ``distributes``, ``requires`` and applicable ``may_require`` + dependencies would be mapped to the Requires dependencies for the + "example" RPM (a mapping from environment markers to SPEC file + conditions would also allow those to be handled correctly) The ``build_requires`` and ``build_may_require`` dependencies would be mapped to the BuildRequires dependencies for the "example" RPM. @@ -997,11 +999,29 @@ to map it to an appropriate dependency in the spec file. +Distributes +----------- + +A list of subdistributions that can easily be installed and used together +by depending on this metadistribution. + +Automated tools MUST allow strict version matching and source reference +clauses in this field and MUST NOT allow more permissive version specifiers. + +Example:: + + "distributes": ["ComfyUpholstery (== 1.0a2)", + "ComfySeatCushion (== 1.0a2)"] + + Requires -------- A list of other distributions needed when this distribution is deployed. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "requires": ["SciPy", "PasteDeploy", "zope.interface (>3.5.0)"] @@ -1032,6 +1052,9 @@ Any extras referenced from this field MUST be named in the `Extras`_ field. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "may_require": [ @@ -1052,6 +1075,9 @@ for this distribution, either during development or when running the ``test_installed_dist`` metabuild when deployed. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "test_requires": ["unittest2"] @@ -1067,6 +1093,9 @@ Any extras referenced from this field MUST be named in the `Extras`_ field. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "test_may_require": [ @@ -1090,6 +1119,9 @@ Note that while these are build dependencies for the distribution being built, the installation is a *deployment* scenario for the dependencies. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "build_requires": ["setuptools (>= 0.7)"] @@ -1110,6 +1142,9 @@ Automated tools MAY assume that all extras are implicitly requested when installing build dependencies. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "build_may_require": [ @@ -1141,6 +1176,9 @@ example, tests that require a local database server and web server and may not work when fully installed on a production system) +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "dev_requires": ["hgtools", "sphinx (>= 1.0)"] @@ -1161,6 +1199,9 @@ Automated tools MAY assume that all extras are implicitly requested when installing development dependencies. +Automated tools MAY disallow strict version matching clauses and source +references in this field and SHOULD at least emit a warning for such clauses. + Example:: "dev_may_require": [ @@ -1295,7 +1336,7 @@ "metabuild_hooks": { "postinstall": "myproject.build_hooks:postinstall", "preuininstall": "myproject.build_hooks:preuninstall", - "test_installed_dist": "some_test_harness.metabuild_hook" + "test_installed_dist": "some_test_harness:metabuild_hook" } Build and installation tools MAY offer additional operations beyond the @@ -1484,7 +1525,8 @@ The pseudo-grammar is :: MARKER: EXPR [(and|or) EXPR]* - EXPR: ("(" MARKER ")") | (SUBEXPR [(in|==|!=|not in) SUBEXPR]) + EXPR: ("(" MARKER ")") | (SUBEXPR [CMPOP SUBEXPR]) + CMPOP: (==|!=|<|>|<=|>=|in|not in) where ``SUBEXPR`` is either a Python string (such as ``'2.4'``, or ``'win32'``) or one of the following marker variables: @@ -1493,17 +1535,18 @@ * ``python_full_version``: see definition below * ``os_name````: ``os.name`` * ``sys_platform````: ``sys.platform`` +* ``platform_release``: ``platform.release()`` * ``platform_version``: ``platform.version()`` * ``platform_machine``: ``platform.machine()`` * ``platform_python_implementation``: ``platform.python_implementation()`` Note that all subexpressions are restricted to strings or one of the -marker variable names, meaning that it is not possible to use other -sequences like tuples or lists on the right side of the ``in`` and -``not in`` operators. - -Unlike Python, chaining of comparison operations is NOT permitted in -environment markers. +marker variable names (which refer to string values), meaning that it is +not possible to use other sequences like tuples or lists on the right +side of the ``in`` and ``not in`` operators. + +Chaining of comparison operations is permitted using the normal Python +semantics of an implied ``and``. The ``python_full_version`` marker variable is derived from ``sys.version_info()`` in accordance with the following algorithm:: @@ -1516,7 +1559,6 @@ version += kind[0] + str(info.serial) return version - Updating the metadata specification =================================== @@ -1653,7 +1695,7 @@ ---------------------------------------------- The separation of the ``requires``, ``build_requires`` and ``dev_requires`` -fields allow a distribution to indicate whether a dependency is needed +fields allows a distribution to indicate whether a dependency is needed specifically to develop, build or deploy the distribution. As distribution metadata improves, this should allow much greater control @@ -1696,7 +1738,7 @@ --------------------------- The new metabuild system is designed to allow the wheel format to fully -replace direct installation on deployment targets, by allows projects like +replace direct installation on deployment targets, by allowing projects like Twisted to still execute code following installation from a wheel file. Falling back to invoking ``setup.py`` directly rather than using a @@ -1704,23 +1746,35 @@ and is also used as the interim solution for installation from source archives. -The ``test_installed_dist`` metabuild hook is included as a complement to -the ability to explicitly specify test dependencies. +The ``test_installed_dist`` metabuild hook is included in order to integrate +with build systems that can automatically invoke test suites, and as +a complement to the ability to explicitly specify test dependencies. Changes to environment markers ------------------------------ -The changes to environment markers were just clarifications and +There are three substantive changes to environment markers in this version:: + +* ``platform_release`` was added, as it provides more useful information + than ``platform_version`` on at least Linux and Mac OS X (specifically, + it provides details of the running kernel version) +* ordered comparison of strings is allowed, as this is more useful for + setting minimum and maximum versions where conditional dependencies + are needed or where a platform is supported +* comparison chaining is explicitly allowed, as this becomes useful in the + presence of ordered comparisons + +The other changes to environment markers are just clarifications and simplifications to make them easier to use. The arbitrariness of the choice of ``.`` and ``_`` in the different -variables was addressed by standardising on ``_`` (as these are predefined -variables rather than live references into the Python module namespace) - -The use of parentheses for grouping and the disallowance of chained -comparisons were added to address some underspecified behaviour in the -previous version of the specification. +variables was addressed by standardising on ``_`` (as these are all +predefined variables rather than live references into the Python module +namespace) + +The use of parentheses for grouping was explicitly noted to address some +underspecified behaviour in the previous version of the specification. Updated contact information @@ -1854,7 +1908,7 @@ tarball and sdist based installation to use the existing ``setup.py`` based ``distutils`` command interface. -In the meantime, the above four operations will continue to be handled +In the meantime, the above three operations will continue to be handled through the ``distutils``/``setuptools`` command system: * ``python setup.py dist_info`` @@ -1870,8 +1924,7 @@ archive Tentative signatures have been designed for those hooks, but they will -not be pursued further until 2.1 (note that the current signatures for -the hooks do *not* adequately handle the "extras" concept):: +not be pursued further until 2.1:: def make_dist_info(source_dir, info_dir): """Generate the contents of dist_info for an sdist archive @@ -1912,6 +1965,11 @@ Returns the actual compatibility tag for the build """ +As with the existing metabuild hooks, checking for extras would be done +using the same import based checks as are used for runtime extras. That +way it doesn't matter if the additional dependencies were requested +explicitly or just happen to be available on the system. + Rejected Features ================= diff --git a/pep-0440.txt b/pep-0440.txt --- a/pep-0440.txt +++ b/pep-0440.txt @@ -99,18 +99,18 @@ sections. -Build labels ------------- +Source labels +------------- -Build labels are text strings with minimal defined semantics. +Source labels are text strings with minimal defined semantics. -To ensure build labels can be readily incorporated as part of file names +To ensure source labels can be readily incorporated as part of file names and URLs, they MUST be comprised of only ASCII alphanumerics, plus signs, periods and hyphens. -In addition, build labels MUST be unique within a given distribution. +In addition, source labels MUST be unique within a given distribution. -As with distribution names, all comparisons of build labels MUST be case +As with distribution names, all comparisons of source labels MUST be case insensitive. @@ -444,7 +444,7 @@ Some projects may choose to use a version scheme which requires translation in order to comply with the public version scheme defined in -this PEP. In such cases, the build label can be used to +this PEP. In such cases, the source label can be used to record the project specific version as an arbitrary label, while the translated public version is published in the version field. @@ -488,7 +488,7 @@ permitted in the public version field. As with semantic versioning, the public ``.devN`` suffix may be used to -uniquely identify such releases for publication, while the build label is +uniquely identify such releases for publication, while the source label is used to record the original DVCS based version label. @@ -496,7 +496,7 @@ ~~~~~~~~~~~~~~~~~~~ As with other incompatible version schemes, date based versions can be -stored in the build label field. Translating them to a compliant +stored in the source label field. Translating them to a compliant public version is straightforward: use a leading ``"0."`` prefix in the public version label, with the date based version number as the remaining components in the release segment. @@ -521,7 +521,7 @@ * ``~=``: `Compatible release`_ clause * ``==``: `Version matching`_ clause * ``!=``: `Version exclusion`_ clause -* ``is``: `Build reference`_ clause +* ``is``: `Source reference`_ clause * ``<=``, ``>=``: `Inclusive ordered comparison`_ clause * ``<``, ``>``: `Exclusive ordered comparison`_ clause @@ -626,10 +626,6 @@ dependencies for repeatable *deployments of applications* while using a shared distribution index. -Publication tools and index servers SHOULD at least emit a warning when -dependencies are pinned in this fashion and MAY refuse to allow publication -of such overly specific dependencies. - Version exclusion ----------------- @@ -649,43 +645,44 @@ != 1.1.* # Same prefix, so 1.1.post1 does not match clause -Build reference ---------------- +Source reference +---------------- -A build reference includes the build reference operator ``is`` and -a build label or a build URL. +A source reference includes the source reference operator ``is`` and +a source label or a source URL. -Publication tools and public index servers SHOULD NOT permit build -references in dependency specifications. +Installation tools MAY also permit direct references to a platform +appropriate binary archive in a source reference clause. -Installation tools SHOULD support the use of build references to identify -dependencies. +Publication tools and public index servers SHOULD NOT permit direct +references to a platform appropriate binary archive in a source +reference clause. -Build label matching works solely on strict equality comparisons: the -candidate build label must be exactly the same as the build label in the +Source label matching works solely on strict equality comparisons: the +candidate source label must be exactly the same as the source label in the version clause for the clause to match the candidate distribution. -For example, a build reference could be used to depend on a ``hashdist`` -generated build of ``zlib`` with the ``hashdist`` hash used as a build -label:: +For example, a source reference could be used to depend directly on a +version control hash based identifier rather than the translated public +version:: - zlib (is d4jwf2sb2g6glprsdqfdpcracwpzujwq) + exact-dependency (is 1.3.7+build.11.e0f985a) -A build URL is distinguished from a build label by the presence of -``:`` and ``/`` characters in the build reference. As these characters -are not permitted in build labels, they indicate that the reference uses -a build URL. +A source URL is distinguished from a source label by the presence of +``:`` and ``/`` characters in the source reference. As these characters +are not permitted in source labels, they indicate that the reference uses +a source URL. -Some appropriate targets for a build URL are a binary archive, a -source tarball, an sdist archive or a direct reference to a tag or -specific commit in an online version control system. The exact URLs and +Some appropriate targets for a source URL are a source tarball, an sdist +archive or a direct reference to a tag or specific commit in an online +version control system. The exact URLs and targets supported will be installation tool specific. -For example, a local prebuilt wheel file may be referenced directly:: +For example, a local source archive may be referenced directly:: - exampledist (is file:///localbuilds/exampledist-1.0-py33-none-any.whl) + pip (is file:///localbuilds/pip-1.3.1.zip) -All build URL references SHOULD either specify a local file URL, a secure +All source URL references SHOULD either specify a local file URL, a secure transport mechanism (such as ``https``) or else include an expected hash value in the URL for verification purposes. If an insecure network transport is specified without any hash information (or with hash @@ -698,7 +695,7 @@ ``'md5'``, ``'sha1'``, ``'sha224'``, ``'sha256'``, ``'sha384'``, and ``'sha512'``. -For binary or source archive references, an expected hash value may be +For source archive references, an expected hash value may be specified by including a ``<hash-algorithm>=<expected-hash>`` as part of the URL fragment. @@ -711,7 +708,7 @@ The use of ``is`` when defining dependencies for published distributions is strongly discouraged as it greatly complicates the deployment of -security fixes. The build label matching operator is intended primarily +security fixes. The source label matching operator is intended primarily for use when defining dependencies for repeatable *deployments of applications* while using a shared distribution index, as well as to reference dependencies which are not published through an index server. @@ -823,31 +820,18 @@ versioning scheme and metadata version defined in new PEPs. -Open issues -=========== - -* The new ``is`` operator seems like a reasonable way to cleanly allow - installation tools to bring in non-published dependencies, while heavily - discouraging the practice for published libraries. It also makes - build labels more useful by allowing them to be used to pin dependencies - in the integration use case. - - However, it's an early draft of the idea, so feedback is definitely - welcome. - - Summary of differences from \PEP 386 ==================================== * Moved the description of version specifiers into the versioning PEP -* added the "build label" concept to better handle projects that wish to +* added the "source label" concept to better handle projects that wish to use a non-compliant versioning scheme internally, especially those based on DVCS hashes * added the "compatible release" clause -* added the "build reference" clause +* added the "source reference" clause * added the trailing wildcard syntax for prefix based version matching and exclusion @@ -869,10 +853,10 @@ The rationale for major changes is given in the following sections. -Adding build labels +Adding source labels ------------------- -The new build label support is intended to make it clearer that the +The new source label support is intended to make it clearer that the constraints on public version identifiers are there primarily to aid in the creation of reliable automated dependency analysis tools. Projects are free to use whatever versioning scheme they like internally, so long @@ -1041,12 +1025,12 @@ and the desired pre-release handling semantics for ``<`` and ``>`` ordered comparison clauses. -Build references are added for two purposes. In conjunction with build -labels, they allow hash based references, such as those employed by -`hashdist <http://hashdist.readthedocs.org/en/latest/build_spec.html>`__, -or generated from version control. In conjunction with build URLs, they -allow the new metadata standard to natively support an existing feature of -``pip``, which allows arbitrary URLs like +Source references are added for two purposes. In conjunction with source +labels, they allow hash based references to exact versions that aren't +compliant with the fully ordered public version scheme, such as those +generated from version control. In combination with source URLs, they +also allow the new metadata standard to natively support an existing +feature of ``pip``, which allows arbitrary URLs like ``file:///localbuilds/exampledist-1.0-py33-none-any.whl``. -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.3 -> default): Merge 3.3.
by stefan.krah May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/148000544c3f changeset: 83975:148000544c3f parent: 83972:e954d7a3bb8a parent: 83974:9156c663d6aa user: Stefan Krah <skrah(a)bytereef.org> date: Wed May 29 15:47:24 2013 +0200 summary: Merge 3.3. files: Lib/decimal.py | 2 +- Lib/test/test_decimal.py | 4 + Modules/_decimal/_decimal.c | 64 ++++++++++++- Modules/_decimal/tests/deccheck.py | 4 +- Modules/_decimal/tests/formathelper.py | 6 +- 5 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Lib/decimal.py b/Lib/decimal.py --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -6138,7 +6138,7 @@ (?:\.(?P<precision>0|(?!0)\d+))? (?P<type>[eEfFgGn%])? \Z -""", re.VERBOSE) +""", re.VERBOSE|re.DOTALL) del re diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -1020,6 +1020,10 @@ ('/=10', '-45.6', '-/////45.6'), ('/=+10', '45.6', '+/////45.6'), ('/= 10', '45.6', ' /////45.6'), + ('\x00=10', '-inf', '-\x00Infinity'), + ('\x00^16', '-inf', '\x00\x00\x00-Infinity\x00\x00\x00\x00'), + ('\x00>10', '1.2345', '\x00\x00\x00\x001.2345'), + ('\x00<10', '1.2345', '1.2345\x00\x00\x00\x00'), # thousands separator (',', '1234567', '1,234,567'), diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -3096,6 +3096,29 @@ return res; } +/* Return a duplicate of src, copy embedded null characters. */ +static char * +dec_strdup(const char *src, Py_ssize_t size) +{ + char *dest = PyMem_Malloc(size+1); + if (dest == NULL) { + return NULL; + } + + memcpy(dest, src, size); + dest[size] = '\0'; + return dest; +} + +static void +dec_replace_fillchar(char *dest) +{ + while (*dest != '\0') { + if (*dest == '\xff') *dest = '\0'; + dest++; + } +} + /* Convert decimal_point or thousands_sep, which may be multibyte or in the range [128, 255], to a UTF8 string. */ static PyObject * @@ -3131,13 +3154,14 @@ PyObject *dot = NULL; PyObject *sep = NULL; PyObject *grouping = NULL; - PyObject *fmt = NULL; PyObject *fmtarg; PyObject *context; mpd_spec_t spec; - char *decstring= NULL; + char *fmt; + char *decstring = NULL; uint32_t status = 0; - size_t n; + int replace_fillchar = 0; + Py_ssize_t size; CURRENT_CONTEXT(context); @@ -3146,10 +3170,20 @@ } if (PyUnicode_Check(fmtarg)) { - fmt = PyUnicode_AsUTF8String(fmtarg); + fmt = PyUnicode_AsUTF8AndSize(fmtarg, &size); if (fmt == NULL) { return NULL; } + if (size > 0 && fmt[0] == '\0') { + /* NUL fill character: must be replaced with a valid UTF-8 char + before calling mpd_parse_fmt_str(). */ + replace_fillchar = 1; + fmt = dec_strdup(fmt, size); + if (fmt == NULL) { + return NULL; + } + fmt[0] = '_'; + } } else { PyErr_SetString(PyExc_TypeError, @@ -3157,12 +3191,19 @@ return NULL; } - if (!mpd_parse_fmt_str(&spec, PyBytes_AS_STRING(fmt), - CtxCaps(context))) { + if (!mpd_parse_fmt_str(&spec, fmt, CtxCaps(context))) { PyErr_SetString(PyExc_ValueError, "invalid format string"); goto finish; } + if (replace_fillchar) { + /* In order to avoid clobbering parts of UTF-8 thousands separators or + decimal points when the substitution is reversed later, the actual + placeholder must be an invalid UTF-8 byte. */ + spec.fill[0] = '\xff'; + spec.fill[1] = '\0'; + } + if (override) { /* Values for decimal_point, thousands_sep and grouping can be explicitly specified in the override dict. These values @@ -3199,7 +3240,7 @@ } } else { - n = strlen(spec.dot); + size_t n = strlen(spec.dot); if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) { /* fix locale dependent non-ascii characters */ dot = dotsep_as_utf8(spec.dot); @@ -3231,14 +3272,19 @@ } goto finish; } - result = PyUnicode_DecodeUTF8(decstring, strlen(decstring), NULL); + size = strlen(decstring); + if (replace_fillchar) { + dec_replace_fillchar(decstring); + } + + result = PyUnicode_DecodeUTF8(decstring, size, NULL); finish: Py_XDECREF(grouping); Py_XDECREF(sep); Py_XDECREF(dot); - Py_XDECREF(fmt); + if (replace_fillchar) PyMem_Free(fmt); if (decstring) mpd_free(decstring); return result; } diff --git a/Modules/_decimal/tests/deccheck.py b/Modules/_decimal/tests/deccheck.py --- a/Modules/_decimal/tests/deccheck.py +++ b/Modules/_decimal/tests/deccheck.py @@ -891,7 +891,7 @@ def test_format(method, prec, exp_range, restricted_range, itr, stat): """Iterate the __format__ method through many test cases.""" for op in all_unary(prec, exp_range, itr): - fmt1 = rand_format(chr(random.randrange(32, 128)), 'EeGgn') + fmt1 = rand_format(chr(random.randrange(0, 128)), 'EeGgn') fmt2 = rand_locale() for fmt in (fmt1, fmt2): fmtop = (op[0], fmt) @@ -904,7 +904,7 @@ except VerifyError as err: log(err) for op in all_unary(prec, 9999, itr): - fmt1 = rand_format(chr(random.randrange(32, 128)), 'Ff%') + fmt1 = rand_format(chr(random.randrange(0, 128)), 'Ff%') fmt2 = rand_locale() for fmt in (fmt1, fmt2): fmtop = (op[0], fmt) diff --git a/Modules/_decimal/tests/formathelper.py b/Modules/_decimal/tests/formathelper.py --- a/Modules/_decimal/tests/formathelper.py +++ b/Modules/_decimal/tests/formathelper.py @@ -215,8 +215,6 @@ c = chr(i) c.encode('utf-8').decode() format(P.Decimal(0), c + '<19g') - if c in ("'", '"', '\\'): - return None return c except: return None @@ -224,14 +222,14 @@ # Generate all unicode characters that are accepted as # fill characters by decimal.py. def all_fillchars(): - for i in range(32, 0x110002): + for i in range(0, 0x110002): c = check_fillchar(i) if c: yield c # Return random fill character. def rand_fillchar(): while 1: - i = random.randrange(32, 0x110002) + i = random.randrange(0, 0x110002) c = check_fillchar(i) if c: return c -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #17768: Support newline fill character in decimal.py and NUL fill
by stefan.krah May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/9156c663d6aa changeset: 83974:9156c663d6aa branch: 3.3 parent: 83971:30128355f53b user: Stefan Krah <skrah(a)bytereef.org> date: Wed May 29 15:45:38 2013 +0200 summary: Issue #17768: Support newline fill character in decimal.py and NUL fill character in _decimal.c. files: Lib/decimal.py | 2 +- Lib/test/test_decimal.py | 4 + Modules/_decimal/_decimal.c | 64 ++++++++++++- Modules/_decimal/tests/deccheck.py | 4 +- Modules/_decimal/tests/formathelper.py | 6 +- 5 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Lib/decimal.py b/Lib/decimal.py --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -6140,7 +6140,7 @@ (?:\.(?P<precision>0|(?!0)\d+))? (?P<type>[eEfFgGn%])? \Z -""", re.VERBOSE) +""", re.VERBOSE|re.DOTALL) del re diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -1021,6 +1021,10 @@ ('/=10', '-45.6', '-/////45.6'), ('/=+10', '45.6', '+/////45.6'), ('/= 10', '45.6', ' /////45.6'), + ('\x00=10', '-inf', '-\x00Infinity'), + ('\x00^16', '-inf', '\x00\x00\x00-Infinity\x00\x00\x00\x00'), + ('\x00>10', '1.2345', '\x00\x00\x00\x001.2345'), + ('\x00<10', '1.2345', '1.2345\x00\x00\x00\x00'), # thousands separator (',', '1234567', '1,234,567'), diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -3096,6 +3096,29 @@ return res; } +/* Return a duplicate of src, copy embedded null characters. */ +static char * +dec_strdup(const char *src, Py_ssize_t size) +{ + char *dest = PyMem_Malloc(size+1); + if (dest == NULL) { + return NULL; + } + + memcpy(dest, src, size); + dest[size] = '\0'; + return dest; +} + +static void +dec_replace_fillchar(char *dest) +{ + while (*dest != '\0') { + if (*dest == '\xff') *dest = '\0'; + dest++; + } +} + /* Convert decimal_point or thousands_sep, which may be multibyte or in the range [128, 255], to a UTF8 string. */ static PyObject * @@ -3131,13 +3154,14 @@ PyObject *dot = NULL; PyObject *sep = NULL; PyObject *grouping = NULL; - PyObject *fmt = NULL; PyObject *fmtarg; PyObject *context; mpd_spec_t spec; - char *decstring= NULL; + char *fmt; + char *decstring = NULL; uint32_t status = 0; - size_t n; + int replace_fillchar = 0; + Py_ssize_t size; CURRENT_CONTEXT(context); @@ -3146,10 +3170,20 @@ } if (PyUnicode_Check(fmtarg)) { - fmt = PyUnicode_AsUTF8String(fmtarg); + fmt = PyUnicode_AsUTF8AndSize(fmtarg, &size); if (fmt == NULL) { return NULL; } + if (size > 0 && fmt[0] == '\0') { + /* NUL fill character: must be replaced with a valid UTF-8 char + before calling mpd_parse_fmt_str(). */ + replace_fillchar = 1; + fmt = dec_strdup(fmt, size); + if (fmt == NULL) { + return NULL; + } + fmt[0] = '_'; + } } else { PyErr_SetString(PyExc_TypeError, @@ -3157,12 +3191,19 @@ return NULL; } - if (!mpd_parse_fmt_str(&spec, PyBytes_AS_STRING(fmt), - CtxCaps(context))) { + if (!mpd_parse_fmt_str(&spec, fmt, CtxCaps(context))) { PyErr_SetString(PyExc_ValueError, "invalid format string"); goto finish; } + if (replace_fillchar) { + /* In order to avoid clobbering parts of UTF-8 thousands separators or + decimal points when the substitution is reversed later, the actual + placeholder must be an invalid UTF-8 byte. */ + spec.fill[0] = '\xff'; + spec.fill[1] = '\0'; + } + if (override) { /* Values for decimal_point, thousands_sep and grouping can be explicitly specified in the override dict. These values @@ -3199,7 +3240,7 @@ } } else { - n = strlen(spec.dot); + size_t n = strlen(spec.dot); if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) { /* fix locale dependent non-ascii characters */ dot = dotsep_as_utf8(spec.dot); @@ -3231,14 +3272,19 @@ } goto finish; } - result = PyUnicode_DecodeUTF8(decstring, strlen(decstring), NULL); + size = strlen(decstring); + if (replace_fillchar) { + dec_replace_fillchar(decstring); + } + + result = PyUnicode_DecodeUTF8(decstring, size, NULL); finish: Py_XDECREF(grouping); Py_XDECREF(sep); Py_XDECREF(dot); - Py_XDECREF(fmt); + if (replace_fillchar) PyMem_Free(fmt); if (decstring) mpd_free(decstring); return result; } diff --git a/Modules/_decimal/tests/deccheck.py b/Modules/_decimal/tests/deccheck.py --- a/Modules/_decimal/tests/deccheck.py +++ b/Modules/_decimal/tests/deccheck.py @@ -891,7 +891,7 @@ def test_format(method, prec, exp_range, restricted_range, itr, stat): """Iterate the __format__ method through many test cases.""" for op in all_unary(prec, exp_range, itr): - fmt1 = rand_format(chr(random.randrange(32, 128)), 'EeGgn') + fmt1 = rand_format(chr(random.randrange(0, 128)), 'EeGgn') fmt2 = rand_locale() for fmt in (fmt1, fmt2): fmtop = (op[0], fmt) @@ -904,7 +904,7 @@ except VerifyError as err: log(err) for op in all_unary(prec, 9999, itr): - fmt1 = rand_format(chr(random.randrange(32, 128)), 'Ff%') + fmt1 = rand_format(chr(random.randrange(0, 128)), 'Ff%') fmt2 = rand_locale() for fmt in (fmt1, fmt2): fmtop = (op[0], fmt) diff --git a/Modules/_decimal/tests/formathelper.py b/Modules/_decimal/tests/formathelper.py --- a/Modules/_decimal/tests/formathelper.py +++ b/Modules/_decimal/tests/formathelper.py @@ -215,8 +215,6 @@ c = chr(i) c.encode('utf-8').decode() format(P.Decimal(0), c + '<19g') - if c in ("'", '"', '\\'): - return None return c except: return None @@ -224,14 +222,14 @@ # Generate all unicode characters that are accepted as # fill characters by decimal.py. def all_fillchars(): - for i in range(32, 0x110002): + for i in range(0, 0x110002): c = check_fillchar(i) if c: yield c # Return random fill character. def rand_fillchar(): while 1: - i = random.randrange(32, 0x110002) + i = random.randrange(0, 0x110002) c = check_fillchar(i) if c: return c -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #17403: urllib.parse.robotparser normalizes the urls before adding to ruleline.
by senthil.kumaran May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/bcbad715c2ce changeset: 83973:bcbad715c2ce branch: 2.7 parent: 83965:ca24bc6a5a4b user: Senthil Kumaran <senthil(a)uthcode.com> date: Wed May 29 05:58:47 2013 -0700 summary: #17403: urllib.parse.robotparser normalizes the urls before adding to ruleline. This helps in handling certain types invalid urls in a conservative manner. files: Lib/robotparser.py | 1 + Lib/test/test_robotparser.py | 12 ++++++++++++ Misc/NEWS | 4 ++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/robotparser.py b/Lib/robotparser.py --- a/Lib/robotparser.py +++ b/Lib/robotparser.py @@ -160,6 +160,7 @@ if path == '' and not allowance: # an empty value means allow all allowance = True + path = urlparse.urlunparse(urlparse.urlparse(path)) self.path = urllib.quote(path) self.allowance = allowance diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -228,6 +228,18 @@ RobotTest(15, doc, good, bad) +# 16. Empty query (issue #17403). Normalizing the url first. +doc = """ +User-agent: * +Allow: /some/path? +Disallow: /another/path? +""" + +good = ['/some/path?'] +bad = ['/another/path?'] + +RobotTest(16, doc, good, bad) + class NetworkTestCase(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,10 @@ Library ------- +- Issue #17403: urllib.parse.robotparser normalizes the urls before adding to + ruleline. This helps in handling certain types invalid urls in a conservative + manner. Patch contributed by Mher Movsisyan. + - Implement inequality on weakref.WeakSet. - Issue #17981: Closed socket on error in SysLogHandler. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge from 3.3
by senthil.kumaran May 29, 2013

May 29, 2013

http://hg.python.org/cpython/rev/e954d7a3bb8a changeset: 83972:e954d7a3bb8a parent: 83970:7a6a8a003553 parent: 83971:30128355f53b user: Senthil Kumaran <senthil(a)uthcode.com> date: Wed May 29 05:57:21 2013 -0700 summary: merge from 3.3 #17403: urllib.parse.robotparser normalizes the urls before adding to ruleline. This helps in handling certain types invalid urls in a conservative manner. Patch contributed by Mher Movsisyan. files: Lib/test/test_robotparser.py | 12 ++++++++++++ Lib/urllib/robotparser.py | 1 + Misc/NEWS | 4 ++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -234,6 +234,18 @@ RobotTest(15, doc, good, bad) +# 16. Empty query (issue #17403). Normalizing the url first. +doc = """ +User-agent: * +Allow: /some/path? +Disallow: /another/path? +""" + +good = ['/some/path?'] +bad = ['/another/path?'] + +RobotTest(16, doc, good, bad) + class NetworkTestCase(unittest.TestCase): diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py --- a/Lib/urllib/robotparser.py +++ b/Lib/urllib/robotparser.py @@ -157,6 +157,7 @@ if path == '' and not allowance: # an empty value means allow all allowance = True + path = urllib.parse.urlunparse(urllib.parse.urlparse(path)) self.path = urllib.parse.quote(path) self.allowance = allowance diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -96,6 +96,10 @@ Library ------- +- Issue #17403: urllib.parse.robotparser normalizes the urls before adding to + ruleline. This helps in handling certain types invalid urls in a conservative + manner. Patch contributed by Mher Movsisyan. + - Issue #18070: Have importlib.util.module_for_loader() set attributes unconditionally in order to properly support reloading. -- Repository URL: http://hg.python.org/cpython

1 0