Mailman 3 April 2012 - Python-checkins

cpython: Issue #13959: Re-implement imp.NullImporter in Lib/imp.py.
by brett.cannon April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/eb5c5c23ca9b changeset: 76633:eb5c5c23ca9b parent: 76629:c468511fc887 user: Brett Cannon <brett(a)python.org> date: Sun Apr 29 12:50:03 2012 -0400 summary: Issue #13959: Re-implement imp.NullImporter in Lib/imp.py. files: Lib/imp.py | 17 +++- Lib/test/test_sys.py | 3 - Python/import.c | 141 +------------------------------ 3 files changed, 17 insertions(+), 144 deletions(-) diff --git a/Lib/imp.py b/Lib/imp.py --- a/Lib/imp.py +++ b/Lib/imp.py @@ -14,8 +14,6 @@ from _imp import get_magic, get_tag # Can (probably) move to importlib from _imp import get_suffixes -# Should be re-implemented here (and mostly deprecated) -from _imp import NullImporter from importlib._bootstrap import _new_module as new_module from importlib._bootstrap import _cache_from_source as cache_from_source @@ -60,6 +58,21 @@ return os.path.join(head, base_filename + _bootstrap.SOURCE_SUFFIXES[0]) +class NullImporter: + + """Null import object.""" + + def __init__(self, path): + if path == '': + raise ImportError('empty pathname', path='') + elif os.path.isdir(path): + raise ImportError('existing directory', path=path) + + def find_module(self, fullname): + """Always returns None.""" + return None + + class _HackedGetData: """Compatibiilty support for 'file' arguments of various load_*() diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -889,9 +889,6 @@ # _ast.AST import _ast check(_ast.AST(), size(h + 'P')) - # imp.NullImporter - import imp - check(imp.NullImporter(self.file.name), size(h + '')) try: raise TypeError except TypeError: diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -205,9 +205,6 @@ PyObject *v, *path_hooks = NULL; int err = 0; - if (PyType_Ready(&PyNullImporter_Type) < 0) - goto error; - /* adding sys.path_hooks and sys.path_importer_cache */ v = PyList_New(0); if (v == NULL) @@ -231,8 +228,7 @@ error: PyErr_Print(); Py_FatalError("initializing sys.meta_path, sys.path_hooks, " - "path_importer_cache, or NullImporter failed" - ); + "or path_importer_cache"); } Py_DECREF(path_hooks); } @@ -284,7 +280,7 @@ error: PyErr_Print(); - Py_FatalError("initializing zipimport or NullImporter failed"); + Py_FatalError("initializing zipimport failed"); } /* Locking primitives to prevent parallel imports of the same module @@ -2244,134 +2240,6 @@ return err; } -typedef struct { - PyObject_HEAD -} NullImporter; - -static int -NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds) -{ -#ifndef MS_WINDOWS - PyObject *path; - struct stat statbuf; - int rv; - - if (!_PyArg_NoKeywords("NullImporter()", kwds)) - return -1; - - if (!PyArg_ParseTuple(args, "O&:NullImporter", - PyUnicode_FSConverter, &path)) - return -1; - - if (PyBytes_GET_SIZE(path) == 0) { - Py_DECREF(path); - PyErr_SetString(PyExc_ImportError, "empty pathname"); - return -1; - } - - rv = stat(PyBytes_AS_STRING(path), &statbuf); - Py_DECREF(path); - if (rv == 0) { - /* it exists */ - if (S_ISDIR(statbuf.st_mode)) { - /* it's a directory */ - PyErr_SetString(PyExc_ImportError, "existing directory"); - return -1; - } - } -#else /* MS_WINDOWS */ - PyObject *pathobj; - DWORD rv; - wchar_t *path; - - if (!_PyArg_NoKeywords("NullImporter()", kwds)) - return -1; - - if (!PyArg_ParseTuple(args, "U:NullImporter", - &pathobj)) - return -1; - - if (PyUnicode_GET_LENGTH(pathobj) == 0) { - PyErr_SetString(PyExc_ImportError, "empty pathname"); - return -1; - } - - path = PyUnicode_AsWideCharString(pathobj, NULL); - if (path == NULL) - return -1; - /* see issue1293 and issue3677: - * stat() on Windows doesn't recognise paths like - * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs. - */ - rv = GetFileAttributesW(path); - PyMem_Free(path); - if (rv != INVALID_FILE_ATTRIBUTES) { - /* it exists */ - if (rv & FILE_ATTRIBUTE_DIRECTORY) { - /* it's a directory */ - PyErr_SetString(PyExc_ImportError, "existing directory"); - return -1; - } - } -#endif - return 0; -} - -static PyObject * -NullImporter_find_module(NullImporter *self, PyObject *args) -{ - Py_RETURN_NONE; -} - -static PyMethodDef NullImporter_methods[] = { - {"find_module", (PyCFunction)NullImporter_find_module, METH_VARARGS, - "Always return None" - }, - {NULL} /* Sentinel */ -}; - - -PyTypeObject PyNullImporter_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "imp.NullImporter", /*tp_name*/ - sizeof(NullImporter), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - 0, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_reserved*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "Null importer object", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - NullImporter_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)NullImporter_init, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew /* tp_new */ -}; - static struct PyModuleDef impmodule = { PyModuleDef_HEAD_INIT, "_imp", @@ -2389,9 +2257,6 @@ { PyObject *m, *d; - if (PyType_Ready(&PyNullImporter_Type) < 0) - return NULL; - m = PyModule_Create(&impmodule); if (m == NULL) goto failure; @@ -2410,8 +2275,6 @@ if (setint(d, "PY_CODERESOURCE", PY_CODERESOURCE) < 0) goto failure; if (setint(d, "IMP_HOOK", IMP_HOOK) < 0) goto failure; - Py_INCREF(&PyNullImporter_Type); - PyModule_AddObject(m, "NullImporter", (PyObject *)&PyNullImporter_Type); return m; failure: Py_XDECREF(m); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: merge
by raymond.hettinger April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/16635c81b329 changeset: 76632:16635c81b329 parent: 76629:c468511fc887 user: Raymond Hettinger <python(a)rcn.com> date: Sun Apr 29 09:35:39 2012 -0700 summary: merge files: Doc/howto/sorting.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/howto/sorting.rst b/Doc/howto/sorting.rst --- a/Doc/howto/sorting.rst +++ b/Doc/howto/sorting.rst @@ -42,7 +42,7 @@ Key Functions ============= -Both :meth:`list.sort` and :func:`sorted` have *key* parameter to specify a +Both :meth:`list.sort` and :func:`sorted` have a *key* parameter to specify a function to be called on each list element prior to making comparisons. For example, here's a case-insensitive string comparison: @@ -89,7 +89,7 @@ The key-function patterns shown above are very common, so Python provides convenience functions to make accessor functions easier and faster. The :mod:`operator` module has :func:`~operator.itemgetter`, -:func:`~operator.attrgetter`, and an :func:`~operator.methodcaller` function. +:func:`~operator.attrgetter`, and a :func:`~operator.methodcaller` function. Using those functions, the above examples become simpler and faster: @@ -114,7 +114,7 @@ ======================== Both :meth:`list.sort` and :func:`sorted` accept a *reverse* parameter with a -boolean value. This is using to flag descending sorts. For example, to get the +boolean value. This is used to flag descending sorts. For example, to get the student data in reverse *age* order: >>> sorted(student_tuples, key=itemgetter(2), reverse=True) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue 14688: Fix typo
by raymond.hettinger April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/295fec2cd5ed changeset: 76631:295fec2cd5ed branch: 3.2 parent: 76627:23d5b457dc71 user: Raymond Hettinger <python(a)rcn.com> date: Sun Apr 29 09:32:30 2012 -0700 summary: Issue 14688: Fix typo files: Doc/howto/sorting.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/howto/sorting.rst b/Doc/howto/sorting.rst --- a/Doc/howto/sorting.rst +++ b/Doc/howto/sorting.rst @@ -42,7 +42,7 @@ Key Functions ============= -Both :meth:`list.sort` and :func:`sorted` have *key* parameter to specify a +Both :meth:`list.sort` and :func:`sorted` have a *key* parameter to specify a function to be called on each list element prior to making comparisons. For example, here's a case-insensitive string comparison: @@ -89,7 +89,7 @@ The key-function patterns shown above are very common, so Python provides convenience functions to make accessor functions easier and faster. The :mod:`operator` module has :func:`~operator.itemgetter`, -:func:`~operator.attrgetter`, and an :func:`~operator.methodcaller` function. +:func:`~operator.attrgetter`, and a :func:`~operator.methodcaller` function. Using those functions, the above examples become simpler and faster: @@ -114,7 +114,7 @@ ======================== Both :meth:`list.sort` and :func:`sorted` accept a *reverse* parameter with a -boolean value. This is using to flag descending sorts. For example, to get the +boolean value. This is used to flag descending sorts. For example, to get the student data in reverse *age* order: >>> sorted(student_tuples, key=itemgetter(2), reverse=True) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix typo
by raymond.hettinger April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/5bad73fbf593 changeset: 76630:5bad73fbf593 branch: 2.7 parent: 76624:b26471a2a115 user: Raymond Hettinger <python(a)rcn.com> date: Sun Apr 29 09:25:25 2012 -0700 summary: Fix typo files: Doc/howto/sorting.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/howto/sorting.rst b/Doc/howto/sorting.rst --- a/Doc/howto/sorting.rst +++ b/Doc/howto/sorting.rst @@ -124,7 +124,7 @@ ======================== Both :meth:`list.sort` and :func:`sorted` accept a *reverse* parameter with a -boolean value. This is using to flag descending sorts. For example, to get the +boolean value. This is used to flag descending sorts. For example, to get the student data in reverse *age* order: >>> sorted(student_tuples, key=itemgetter(2), reverse=True) -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Record Richard Oudkerk.
by antoine.pitrou April 29, 2012

April 29, 2012

http://hg.python.org/devguide/rev/da272d76e9fc changeset: 506:da272d76e9fc user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Apr 29 17:11:11 2012 +0200 summary: Record Richard Oudkerk. files: developers.rst | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/developers.rst b/developers.rst --- a/developers.rst +++ b/developers.rst @@ -24,6 +24,11 @@ Permissions History ------------------- +- Richard Oudkerk was given push privileges on Apr 29 2012 by Antoine Pitrou + on recommendation by Charles-François Natali and Jesse Noller, for various + contributions to multiprocessing (and original authorship of + multiprocessing's predecessor, the processing package). + - Andrew Svetlov was given push privileges on Mar 13 2012 by MvL at the PyCon sprint. -- Repository URL: http://hg.python.org/devguide

1 0

cpython: Issue #14521: Make result of float('nan') and float('-nan') more consistent
by mark.dickinson April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/c468511fc887 changeset: 76629:c468511fc887 user: Mark Dickinson <mdickinson(a)enthought.com> date: Sun Apr 29 15:31:56 2012 +0100 summary: Issue #14521: Make result of float('nan') and float('-nan') more consistent across platforms. Further, don't rely on Py_HUGE_VAL for float('inf'). files: Include/dtoa.h | 2 + Lib/test/test_float.py | 13 +++++++ Misc/NEWS | 3 + Python/dtoa.c | 50 +++++++++++++++++++++++++++--- Python/pystrtod.c | 39 +++++++++++++++++++++++ 5 files changed, 102 insertions(+), 5 deletions(-) diff --git a/Include/dtoa.h b/Include/dtoa.h --- a/Include/dtoa.h +++ b/Include/dtoa.h @@ -8,6 +8,8 @@ PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve); PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); +PyAPI_FUNC(double) _Py_dg_stdnan(int sign); +PyAPI_FUNC(double) _Py_dg_infinity(int sign); #ifdef __cplusplus diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -870,6 +870,19 @@ self.assertFalse(NAN.is_inf()) self.assertFalse((0.).is_inf()) + def test_inf_signs(self): + self.assertEqual(copysign(1.0, float('inf')), 1.0) + self.assertEqual(copysign(1.0, float('-inf')), -1.0) + + @unittest.skipUnless(getattr(sys, 'float_repr_style', '') == 'short', + "applies only when using short float repr style") + def test_nan_signs(self): + # When using the dtoa.c code, the sign of float('nan') should + # be predictable. + self.assertEqual(copysign(1.0, float('nan')), 1.0) + self.assertEqual(copysign(1.0, float('-nan')), -1.0) + + fromHex = float.fromhex toHex = float.hex class HexFloatTestCase(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14521: Make result of float('nan') and float('-nan') more + consistent across platforms. + - Issue #14646: __import__() sets __loader__ if the loader did not. - Issue #14605: No longer have implicit entries in sys.meta_path. If diff --git a/Python/dtoa.c b/Python/dtoa.c --- a/Python/dtoa.c +++ b/Python/dtoa.c @@ -265,6 +265,16 @@ #define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1)) #define Big1 0xffffffff +/* Standard NaN used by _Py_dg_stdnan. */ + +#define NAN_WORD0 0x7ff80000 +#define NAN_WORD1 0 + +/* Bits of the representation of positive infinity. */ + +#define POSINF_WORD0 0x7ff00000 +#define POSINF_WORD1 0 + /* struct BCinfo is used to pass information from _Py_dg_strtod to bigcomp */ typedef struct BCinfo BCinfo; @@ -1486,6 +1496,36 @@ return 0; } +/* Return a 'standard' NaN value. + + There are exactly two quiet NaNs that don't arise by 'quieting' signaling + NaNs (see IEEE 754-2008, section 6.2.1). If sign == 0, return the one whose + sign bit is cleared. Otherwise, return the one whose sign bit is set. +*/ + +double +_Py_dg_stdnan(int sign) +{ + U rv; + word0(&rv) = NAN_WORD0; + word1(&rv) = NAN_WORD1; + if (sign) + word0(&rv) |= Sign_bit; + return dval(&rv); +} + +/* Return positive or negative infinity, according to the given sign (0 for + * positive infinity, 1 for negative infinity). */ + +double +_Py_dg_infinity(int sign) +{ + U rv; + word0(&rv) = POSINF_WORD0; + word1(&rv) = POSINF_WORD1; + return sign ? -dval(&rv) : dval(&rv); +} + double _Py_dg_strtod(const char *s00, char **se) { @@ -1886,20 +1926,20 @@ bd2++; /* At this stage bd5 - bb5 == e == bd2 - bb2 + bbe, bb2 - bs2 == 1, - and bs == 1, so: + and bs == 1, so: tdv == bd * 10**e = bd * 2**(bbe - bb2 + bd2) * 5**(bd5 - bb5) srv == bb * 2**bbe = bb * 2**(bbe - bb2 + bb2) - 0.5 ulp(srv) == 2**(bbe-1) = bs * 2**(bbe - bb2 + bs2) + 0.5 ulp(srv) == 2**(bbe-1) = bs * 2**(bbe - bb2 + bs2) - It follows that: + It follows that: M * tdv = bd * 2**bd2 * 5**bd5 M * srv = bb * 2**bb2 * 5**bb5 M * 0.5 ulp(srv) = bs * 2**bs2 * 5**bb5 - for some constant M. (Actually, M == 2**(bb2 - bbe) * 5**bb5, but - this fact is not needed below.) + for some constant M. (Actually, M == 2**(bb2 - bbe) * 5**bb5, but + this fact is not needed below.) */ /* Remove factor of 2**i, where i = min(bb2, bd2, bs2). */ diff --git a/Python/pystrtod.c b/Python/pystrtod.c --- a/Python/pystrtod.c +++ b/Python/pystrtod.c @@ -22,6 +22,43 @@ the successfully parsed portion of the string. On failure, return -1.0 and set *endptr to point to the start of the string. */ +#ifndef PY_NO_SHORT_FLOAT_REPR + +double +_Py_parse_inf_or_nan(const char *p, char **endptr) +{ + double retval; + const char *s; + int negate = 0; + + s = p; + if (*s == '-') { + negate = 1; + s++; + } + else if (*s == '+') { + s++; + } + if (case_insensitive_match(s, "inf")) { + s += 3; + if (case_insensitive_match(s, "inity")) + s += 5; + retval = _Py_dg_infinity(negate); + } + else if (case_insensitive_match(s, "nan")) { + s += 3; + retval = _Py_dg_stdnan(negate); + } + else { + s = p; + retval = -1.0; + } + *endptr = (char *)s; + return retval; +} + +#else + double _Py_parse_inf_or_nan(const char *p, char **endptr) { @@ -57,6 +94,8 @@ return retval; } +#endif + /** * _PyOS_ascii_strtod: * @nptr: the string to convert to a numeric value. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #14236: merge with 3.2.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/9165774a8055 changeset: 76628:9165774a8055 parent: 76626:7cc1cddb378d parent: 76627:23d5b457dc71 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 13:37:13 2012 +0300 summary: #14236: merge with 3.2. files: Lib/re.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/re.py b/Lib/re.py --- a/Lib/re.py +++ b/Lib/re.py @@ -73,7 +73,7 @@ bytes patterns or string patterns with the ASCII flag. In string patterns without the ASCII flag, it will match the whole range of Unicode whitespace characters. - \S Matches any non-whitespace character; equiv. to [^ \t\n\r\f\v]. + \S Matches any non-whitespace character; equivalent to [^\s]. \w Matches any alphanumeric character; equivalent to [a-zA-Z0-9_] in bytes patterns or string patterns with the ASCII flag. In string patterns without the ASCII flag, it will match the -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Move the devrole section one level up.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/devguide/rev/666105c412d8 changeset: 505:666105c412d8 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 13:21:57 2012 +0300 summary: Move the devrole section one level up. files: tracker.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tracker.rst b/tracker.rst --- a/tracker.rst +++ b/tracker.rst @@ -135,7 +135,7 @@ .. _devrole: Gaining the "Developer" Role on the Issue Tracker -------------------------------------------------- +================================================= When you have consistently shown the ability to properly help triage issues without guidance, you may request that you -- Repository URL: http://hg.python.org/devguide

1 0

devguide: Reorder sections in the help page.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/devguide/rev/ebb84bd3e3f8 changeset: 504:ebb84bd3e3f8 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 12:58:16 2012 +0300 summary: Reorder sections in the help page. files: help.rst | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/help.rst b/help.rst --- a/help.rst +++ b/help.rst @@ -26,17 +26,17 @@ .. _freenode: http://freenode.net/ -File a Bug ----------- +Core Mentorship +--------------- -If you strongly suspect you have stumbled on a bug (be it in the build -process, in the test suite, or in other areas), then open an issue on the -`issue tracker`_. As with every bug report it is strongly advised that -you detail which conditions triggered it (including the OS name and version, -and what you were trying to do), as well as the exact error message you -encountered. +If you are interested in improving Python and contributing to its development, +but don’t yet feel entirely comfortable with the public channels mentioned +above, `Python Mentors`_ are here to help you. Python is fortunate to have a +community of volunteer core developers willing to mentor anyone wishing to +contribute code, work on bug fixes or improve documentation. Everyone is +welcomed and encouraged to contribute. -.. _issue tracker: http://bugs.python.org +.. _Python Mentors: http://pythonmentors.com Mailing Lists @@ -56,14 +56,14 @@ .. _python-dev: http://mail.python.org/mailman/listinfo/python-dev -Core Mentorship ---------------- +File a Bug +---------- -If you are interested in improving Python and contributing to its development, -but don’t yet feel entirely comfortable with the public channels mentioned -above, `Python Mentors`_ are here to help you. Python is fortunate to have a -community of volunteer core developers willing to mentor anyone wishing to -contribute code, work on bug fixes or improve documentation. Everyone is -welcomed and encouraged to contribute. +If you strongly suspect you have stumbled on a bug (be it in the build +process, in the test suite, or in other areas), then open an issue on the +`issue tracker`_. As with every bug report it is strongly advised that +you detail which conditions triggered it (including the OS name and version, +and what you were trying to do), as well as the exact error message you +encountered. -.. _Python Mentors: http://pythonmentors.com +.. _issue tracker: http://bugs.python.org -- Repository URL: http://hg.python.org/devguide

1 0

cpython (merge 3.2 -> default): #14519: merge with 3.2.
by ezio.melotti April 29, 2012

April 29, 2012

http://hg.python.org/cpython/rev/7cc1cddb378d changeset: 76626:7cc1cddb378d parent: 76623:00221c8b7c86 parent: 76625:e317d651ccf8 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Apr 29 11:48:54 2012 +0300 summary: #14519: merge with 3.2. files: Doc/library/re.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/re.rst b/Doc/library/re.rst --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -1075,13 +1075,13 @@ +--------------------------------+---------------------------------------------+ | ``%i`` | ``[-+]?(0[xX][\dA-Fa-f]+|0[0-7]*|\d+)`` | +--------------------------------+---------------------------------------------+ -| ``%o`` | ``0[0-7]*`` | +| ``%o`` | ``[-+]?[0-7]+`` | +--------------------------------+---------------------------------------------+ | ``%s`` | ``\S+`` | +--------------------------------+---------------------------------------------+ | ``%u`` | ``\d+`` | +--------------------------------+---------------------------------------------+ -| ``%x``, ``%X`` | ``0[xX][\dA-Fa-f]+`` | +| ``%x``, ``%X`` | ``[-+]?(0[xX])?[\dA-Fa-f]+`` | +--------------------------------+---------------------------------------------+ To extract the filename and numbers from a string like :: -- Repository URL: http://hg.python.org/cpython

1 0