Mailman 3 February 2012 - Python-checkins

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

July 29, 2012

> 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: Issue #14153 Create _Py_device_encoding() to prevent _io from having to import
by brett.cannon Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/cpython/rev/c80d9a0bd5a0 changeset: 75353:c80d9a0bd5a0 user: Brett Cannon <brett(a)python.org> date: Wed Feb 29 18:31:31 2012 -0500 summary: Issue #14153 Create _Py_device_encoding() to prevent _io from having to import the os module. files: Include/fileutils.h | 2 + Lib/test/test_os.py | 19 ++++++++++++++++ Modules/_io/_iomodule.c | 14 ++--------- Modules/_io/_iomodule.h | 5 +-- Modules/_io/textio.c | 11 +++++--- Modules/posixmodule.c | 30 ++----------------------- Python/fileutils.c | 34 +++++++++++++++++++++++++++++ 7 files changed, 70 insertions(+), 45 deletions(-) diff --git a/Include/fileutils.h b/Include/fileutils.h --- a/Include/fileutils.h +++ b/Include/fileutils.h @@ -5,6 +5,8 @@ extern "C" { #endif +PyAPI_FUNC(PyObject *) _Py_device_encoding(int); + PyAPI_FUNC(wchar_t *) _Py_char2wchar( const char *arg, size_t *size); diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -22,6 +22,8 @@ import socket import itertools import stat +import locale +import codecs try: import threading except ImportError: @@ -1424,6 +1426,22 @@ self.assertEqual(os.fsdecode(bytesfn), fn) + +class DeviceEncodingTests(unittest.TestCase): + + def test_bad_fd(self): + # Return None when an fd doesn't actually exist. + self.assertIsNone(os.device_encoding(123456)) + + @unittest.skipUnless(sys.platform.startswith('win') or + (hasattr(locale, 'nl_langinfo') and hasattr(locale, 'CODESET')), + 'test requires either Windows or nl_langinfo(CODESET)') + def test_device_encoding(self): + encoding = os.device_encoding(0) + self.assertIsNotNone(encoding) + self.assertTrue(codecs.lookup(encoding)) + + class PidTests(unittest.TestCase): @unittest.skipUnless(hasattr(os, 'getppid'), "test needs os.getppid") def test_getppid(self): @@ -1923,6 +1941,7 @@ Win32KillTests, Win32SymlinkTests, FSEncodingTests, + DeviceEncodingTests, PidTests, LoginTests, LinkTests, diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -1,9 +1,9 @@ /* An implementation of the new I/O lib as defined by PEP 3116 - "New I/O" - + Classes defined here: UnsupportedOperation, BlockingIOError. Functions defined here: open(). - + Mostly written by Amaury Forgeot d'Arc */ @@ -510,7 +510,7 @@ /* Basically the "n" format code with the ability to turn None into -1. */ -int +int _PyIO_ConvertSsize_t(PyObject *obj, void *result) { Py_ssize_t limit; if (obj == Py_None) { @@ -537,7 +537,6 @@ _PyIO_State *state = IO_MOD_STATE(mod); if (!state->initialized) return 0; - Py_VISIT(state->os_module); if (state->locale_module != NULL) { Py_VISIT(state->locale_module); } @@ -551,7 +550,6 @@ _PyIO_State *state = IO_MOD_STATE(mod); if (!state->initialized) return 0; - Py_CLEAR(state->os_module); if (state->locale_module != NULL) Py_CLEAR(state->locale_module); Py_CLEAR(state->unsupported_operation); @@ -595,11 +593,6 @@ state = IO_MOD_STATE(m); state->initialized = 0; - /* put os in the module state */ - state->os_module = PyImport_ImportModule("os"); - if (state->os_module == NULL) - goto fail; - #define ADD_TYPE(type, name) \ if (PyType_Ready(type) < 0) \ goto fail; \ @@ -725,7 +718,6 @@ return m; fail: - Py_XDECREF(state->os_module); Py_XDECREF(state->unsupported_operation); Py_DECREF(m); return NULL; diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -50,8 +50,8 @@ `*consumed`. If not found, returns -1 and sets `*consumed` to the number of characters which can be safely put aside until another search. - - NOTE: for performance reasons, `end` must point to a NUL character ('\0'). + + NOTE: for performance reasons, `end` must point to a NUL character ('\0'). Otherwise, the function will scan further and return garbage. */ extern Py_ssize_t _PyIO_find_line_ending( int translated, int universal, PyObject *readnl, @@ -124,7 +124,6 @@ typedef struct { int initialized; - PyObject *os_module; PyObject *locale_module; PyObject *unsupported_operation; diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -14,7 +14,6 @@ _Py_IDENTIFIER(close); _Py_IDENTIFIER(_dealloc_warn); _Py_IDENTIFIER(decode); -_Py_IDENTIFIER(device_encoding); _Py_IDENTIFIER(fileno); _Py_IDENTIFIER(flush); _Py_IDENTIFIER(getpreferredencoding); @@ -875,9 +874,13 @@ } } else { - self->encoding = _PyObject_CallMethodId(state->os_module, - &PyId_device_encoding, - "N", fileno); + int fd = (int) PyLong_AsLong(fileno); + Py_DECREF(fileno); + if (fd == -1 && PyErr_Occurred()) { + goto error; + } + + self->encoding = _Py_device_encoding(fd); if (self->encoding == NULL) goto error; else if (!PyUnicode_Check(self->encoding)) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -9326,35 +9326,11 @@ device_encoding(PyObject *self, PyObject *args) { int fd; -#if defined(MS_WINDOWS) || defined(MS_WIN64) - UINT cp; -#endif + if (!PyArg_ParseTuple(args, "i:device_encoding", &fd)) return NULL; - if (!_PyVerify_fd(fd) || !isatty(fd)) { - Py_INCREF(Py_None); - return Py_None; - } -#if defined(MS_WINDOWS) || defined(MS_WIN64) - if (fd == 0) - cp = GetConsoleCP(); - else if (fd == 1 || fd == 2) - cp = GetConsoleOutputCP(); - else - cp = 0; - /* GetConsoleCP() and GetConsoleOutputCP() return 0 if the application - has no console */ - if (cp != 0) - return PyUnicode_FromFormat("cp%u", (unsigned int)cp); -#elif defined(CODESET) - { - char *codeset = nl_langinfo(CODESET); - if (codeset != NULL && codeset[0] != 0) - return PyUnicode_FromString(codeset); - } -#endif - Py_INCREF(Py_None); - return Py_None; + + return _Py_device_encoding(fd); } #ifdef __VMS diff --git a/Python/fileutils.c b/Python/fileutils.c --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -3,6 +3,40 @@ # include <windows.h> #endif +#ifdef HAVE_LANGINFO_H +#include <langinfo.h> +#endif + +PyObject * +_Py_device_encoding(int fd) +{ +#if defined(MS_WINDOWS) || defined(MS_WIN64) + UINT cp; +#endif + if (!_PyVerify_fd(fd) || !isatty(fd)) { + Py_RETURN_NONE; + } +#if defined(MS_WINDOWS) || defined(MS_WIN64) + if (fd == 0) + cp = GetConsoleCP(); + else if (fd == 1 || fd == 2) + cp = GetConsoleOutputCP(); + else + cp = 0; + /* GetConsoleCP() and GetConsoleOutputCP() return 0 if the application + has no console */ + if (cp != 0) + return PyUnicode_FromFormat("cp%u", (unsigned int)cp); +#elif defined(CODESET) + { + char *codeset = nl_langinfo(CODESET); + if (codeset != NULL && codeset[0] != 0) + return PyUnicode_FromString(codeset); + } +#endif + Py_RETURN_NONE; +} + #ifdef HAVE_STAT /* Decode a byte string from the locale encoding with the -- Repository URL: http://hg.python.org/cpython

1 0

peps: PEP 411: incorporated comments from pydev discussions
by eli.bendersky Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/peps/rev/78b0a17b50ac changeset: 4101:78b0a17b50ac user: Eli Bendersky <eliben(a)gmail.com> date: Wed Feb 29 21:44:39 2012 +0200 summary: PEP 411: incorporated comments from pydev discussions files: pep-0411.txt | 44 ++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/pep-0411.txt b/pep-0411.txt --- a/pep-0411.txt +++ b/pep-0411.txt @@ -39,10 +39,10 @@ "provisional". In the next minor release, the package may either be "graduated" into a normal -"stable" state in the standard library, or be rejected and removed entirely -from the Python source tree. If the package ends up graduating into the -stable state after being provisional for a minor release, its API may be -changed according to accumulated feedback. The core development team +"stable" state in the standard library, remain in provisional state, or be +rejected and removed entirely from the Python source tree. If the package ends +up graduating into the stable state after being provisional, its API may +be changed according to accumulated feedback. The core development team explicitly makes no guarantees about API stability and backward compatibility of provisional packages. @@ -50,19 +50,37 @@ Marking a package provisional ----------------------------- -A package will be marked provisional by including the following paragraph as -a note at the top of its documentation page: +A package will be marked provisional by a notice in its documentation page and +its docstring. The following paragraph will be added as a note at the top of +the documentation page: The <X> package has been included in the standard library on a - provisional basis. While major changes are not anticipated, as long as - this notice remains in place, backwards incompatible changes are - permitted if deemed necessary by the standard library developers. Such - changes will not be made gratuitously - they will occur only if - serious API flaws are uncovered that were missed prior to inclusion of - the package. + provisional basis. Backwards incompatible changes (up to and including + removal of the package) may occur if deemed necessary by the core + developers. + +The phrase "provisional basis" will then be a link to the glossary term +"provisional package", defined as: + + A provisional package is one which has been deliberately excluded from the + standard library's normal backwards compatibility guarantees. While major + changes to such packages are not expected, as long as they are marked + provisional, backwards incompatible changes (up to and including removal of + the package) may occur if deemed necessary by core developers. Such changes + will not be made gratuitously - they will occur only if serious flaws are + uncovered that were missed prior to the inclusion of the package. + + This process allows the standard library to continue to evolve over time, + without locking in problematic design errors for extended periods of time. + See PEP 411 for more details. + +The following will be added to the start of the packages's docstring: + + The API of this package is currently provisional. Refer to the + documentation for details. Moving a package from the provisional to the stable state simply implies -removing this note from its documentation page. +removing these notes from its documentation page and docstring. Which packages should go through the provisional state -- Repository URL: http://hg.python.org/peps

1 0

peps: Add the PEP 416: Add a frozendict builtin type
by victor.stinner Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/peps/rev/369cd3f69cd2 changeset: 4100:369cd3f69cd2 user: Victor Stinner <vstinner(a)wyplay.com> date: Wed Feb 29 18:58:50 2012 +0100 summary: Add the PEP 416: Add a frozendict builtin type files: pep-0400.txt | 2 +- pep-0410.txt | 2 +- pep-0416.txt | 112 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) diff --git a/pep-0400.txt b/pep-0400.txt --- a/pep-0400.txt +++ b/pep-0400.txt @@ -2,7 +2,7 @@ Title: Deprecate codecs.StreamReader and codecs.StreamWriter Version: $Revision$ Last-Modified: $Date$ -Author: Victor Stinner <victor.stinner(a)haypocalc.com> +Author: Victor Stinner <victor.stinner(a)gmail.com> Status: Draft Type: Standards Track Content-Type: text/x-rst diff --git a/pep-0410.txt b/pep-0410.txt --- a/pep-0410.txt +++ b/pep-0410.txt @@ -2,7 +2,7 @@ Title: Use decimal.Decimal type for timestamps Version: $Revision$ Last-Modified: $Date$ -Author: Victor Stinner <victor.stinner(a)haypocalc.com> +Author: Victor Stinner <victor.stinner(a)gmail.com> Status: Rejected Type: Standards Track Content-Type: text/x-rst diff --git a/pep-0416.txt b/pep-0416.txt new file mode 100644 --- /dev/null +++ b/pep-0416.txt @@ -0,0 +1,112 @@ +PEP: 416 +Title: Add a frozendict builtin type +Version: $Revision$ +Last-Modified: $Date$ +Author: Victor Stinner <victor.stinner(a)gmail.com> +Status: Draft +Type: Standards Track +Content-Type: text/x-rst +Created: 29-February-2012 +Python-Version: 3.3 + + +Abstract +======== + +Add a new frozendict builtin type. + + +Rationale +========= + +A frozendict mapping cannot be changed, but its values can be mutable (not +hashable). A frozendict is hashable and so immutable if all values are hashable +(immutable). + +Use cases of frozendict: + + * hashable frozendict can be used as a key of a mapping or as a member of set + * frozendict helps optimization because the mapping is constant + * frozendict avoids the need of a lock when the frozendict is shared + by multiple threads or processes, especially hashable frozendict + + +Constraints +=========== + + * frozendict has to implement the Mapping abstract base class + * frozendict keys and values can be unorderable + * a frozendict is hashable if all keys and values are hashable + * frozendict hash does not depend on the items creation order + + +Implementation +============== + + * Add a PyFrozenDictObject structure based on PyDictObject with an extra + "Py_hash_t hash;" field + * frozendict.__hash__() is implemented using hash(frozenset(self.items())) and + caches the result in its private hash attribute + * Register frozendict has a collections.abc.Mapping + * frozendict can be used with PyDict_GetItem(), but PyDict_SetItem() and + PyDict_DelItem() raise a TypeError + + +Recipe: immutable dict +====================== + +An immutable mapping can be implemented using frozendict:: + + import itertools + + class immutabledict(frozendict): + def __new__(cls, *args, **kw): + # ensure that all values are immutable + for key, value in itertools.chain(args, kw.items()): + if not isinstance(value, (int, float, complex, str, bytes)): + hash(value) + # frozendict ensures that all keys are immutable + return frozendict.__new__(cls, *args, **kw) + + def __repr__(self): + return 'immutabledict' + frozendict.__repr__(self)[10:] + + +Objections +========== + +*namedtuple may fit the requiements of a frozendict.* + +A namedtuple is not a mapping, it does not implement the Mapping abstract base +class. + +*frozendict can be implemented in Python using descriptors" and "frozendict +just need to be practically constant.* + +If frozendict is used to harden Python (security purpose), it must be +implemented in C. A type implemented in C is also faster. + +*The PEP 351 was rejected.* + +The PEP 351 tries to freeze an object and so may convert a mutable object to an +immutable object (using a different type). frozendict doesn't convert anything: +hash(frozendict) raises a TypeError if a value is not hashable. Freezing an +object is not the purpose of this PEP. + + +Links +===== + + * PEP 412: Key-Sharing Dictionary + (`issue #13903 <http://bugs.python.org/issue13903>`_) + * PEP 351: The freeze protocol + * `The case for immutable dictionaries; and the central misunderstanding of PEP 351 <http://www.cs.toronto.edu/~tijmen/programming/immutableDictionaries.html>`_ + * `Frozen dictionaries (Python recipe 414283) <http://code.activestate.com/recipes/414283-frozen-dictionaries/>`_ + by Oren Tirosh + + +Copyright +========= + +This document has been placed in the public domain. + -- Repository URL: http://hg.python.org/peps

1 0

cpython: Issue #10181: Add warning that structure layouts in memoryobject.h and
by stefan.krah Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/cpython/rev/9d3c7dd55c7f changeset: 75352:9d3c7dd55c7f user: Stefan Krah <skrah(a)bytereef.org> date: Wed Feb 29 17:47:21 2012 +0100 summary: Issue #10181: Add warning that structure layouts in memoryobject.h and object.h have changed. files: Doc/whatsnew/3.3.rst | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -102,6 +102,7 @@ now returns an integer (in accordance with the struct module syntax). For returning a bytes object the view must be cast to 'c' first. +* For further changes see `Build and C API Changes`_ and `Porting C code`_ . .. _pep-393: @@ -1049,6 +1050,14 @@ Porting C code -------------- +* In the course of changes to the buffer API the undocumented + :c:member:`~Py_buffer.smalltable` member of the + :c:type:`Py_buffer` structure has been removed and the + layout of the :c:type:`PyMemoryViewObject` has changed. + + All extensions relying on the relevant parts in ``memoryobject.h`` + or ``object.h`` must be rebuilt. + * Due to :ref:`PEP 393 <pep-393>`, the :c:type:`Py_UNICODE` type and all functions using this type are deprecated (but will stay available for at least five years). If you were using low-level Unicode APIs to -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Add PyMemoryView_FromMemory() to whatsnew/3.3.
by stefan.krah Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/cpython/rev/09e9560d649b changeset: 75351:09e9560d649b parent: 75349:c85812b0e97d user: Stefan Krah <skrah(a)bytereef.org> date: Wed Feb 29 17:27:21 2012 +0100 summary: Add PyMemoryView_FromMemory() to whatsnew/3.3. files: Doc/c-api/memoryview.rst | 2 ++ Doc/whatsnew/3.3.rst | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Doc/c-api/memoryview.rst b/Doc/c-api/memoryview.rst --- a/Doc/c-api/memoryview.rst +++ b/Doc/c-api/memoryview.rst @@ -25,6 +25,8 @@ Create a memoryview object using *mem* as the underlying buffer. *flags* can be one of :c:macro:`PyBUF_READ` or :c:macro:`PyBUF_WRITE`. + .. versionadded:: 3.3 + .. c:function:: PyObject *PyMemoryView_FromBuffer(Py_buffer *view) Create a memoryview object wrapping the given buffer structure *view*. diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -906,6 +906,10 @@ Changes to Python's build process and to the C API include: +* New :pep:`3118` related function: + + * :c:func:`PyMemoryView_FromMemory` + * The :pep:`393` added new Unicode types, macros and functions: * High-level API: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #14152: Merge fix from 3.2.
by stefan.krah Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/cpython/rev/c85812b0e97d changeset: 75349:c85812b0e97d parent: 75347:90f459e986c8 parent: 75348:1c77eadba9dc user: Stefan Krah <skrah(a)bytereef.org> date: Wed Feb 29 14:14:00 2012 +0100 summary: Issue #14152: Merge fix from 3.2. files: setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -195,7 +195,7 @@ # Python header files headers = [sysconfig.get_config_h_filename()] - headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h")) + headers += glob(os.path.join(sysconfig.get_path('include'), "*.h")) for ext in self.extensions[:]: ext.sources = [ find_module_file(filename, moddirlist) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #14152: backport fix.
by stefan.krah Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/cpython/rev/3e2c230f4664 changeset: 75350:3e2c230f4664 branch: 2.7 parent: 75345:8e00de3acb44 user: Stefan Krah <skrah(a)bytereef.org> date: Wed Feb 29 14:17:18 2012 +0100 summary: Issue #14152: backport fix. files: setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -186,7 +186,7 @@ # Python header files headers = [sysconfig.get_config_h_filename()] - headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h")) + headers += glob(os.path.join(sysconfig.get_path('include'), "*.h")) for ext in self.extensions[:]: ext.sources = [ find_module_file(filename, moddirlist) for filename in ext.sources ] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #14152: Restore the Include/*.h dependencies for extension builds.
by stefan.krah Feb. 29, 2012

Feb. 29, 2012

http://hg.python.org/cpython/rev/1c77eadba9dc changeset: 75348:1c77eadba9dc branch: 3.2 parent: 75346:0bbc2549e1ee user: Stefan Krah <skrah(a)bytereef.org> date: Wed Feb 29 14:10:53 2012 +0100 summary: Issue #14152: Restore the Include/*.h dependencies for extension builds. files: setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -197,7 +197,7 @@ # Python header files headers = [sysconfig.get_config_h_filename()] - headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h")) + headers += glob(os.path.join(sysconfig.get_path('include'), "*.h")) for ext in self.extensions[:]: ext.sources = [ find_module_file(filename, moddirlist) -- Repository URL: http://hg.python.org/cpython

1 0

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

Feb. 29, 2012

http://hg.python.org/cpython/rev/90f459e986c8 changeset: 75347:90f459e986c8 parent: 75344:457c3c0cb0a0 parent: 75346:0bbc2549e1ee user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Wed Feb 29 14:06:56 2012 +0200 summary: #14089: merge with 3.2. files: Lib/test/test_fractions.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py --- a/Lib/test/test_fractions.py +++ b/Lib/test/test_fractions.py @@ -6,6 +6,7 @@ import numbers import operator import fractions +import sys import unittest from copy import copy, deepcopy from pickle import dumps, loads @@ -76,6 +77,9 @@ def __float__(self): assert False, "__float__ should not be invoked" +class DummyFraction(fractions.Fraction): + """Dummy Fraction subclass for copy and deepcopy testing.""" + class GcdTest(unittest.TestCase): def testMisc(self): @@ -286,9 +290,14 @@ self.assertEqual(F(201, 200).limit_denominator(100), F(1)) self.assertEqual(F(201, 200).limit_denominator(101), F(102, 101)) self.assertEqual(F(0).limit_denominator(10000), F(0)) + for i in (0, -1): + self.assertRaisesMessage( + ValueError, "max_denominator should be at least 1", + F(1).limit_denominator, i) def testConversions(self): self.assertTypedEquals(-1, math.trunc(F(-11, 10))) + self.assertTypedEquals(1, math.trunc(F(11, 10))) self.assertTypedEquals(-2, math.floor(F(-11, 10))) self.assertTypedEquals(-1, math.ceil(F(-11, 10))) self.assertTypedEquals(-1, math.ceil(F(-10, 10))) @@ -329,6 +338,7 @@ self.assertEqual(F(8, 27), F(2, 3) ** F(3)) self.assertEqual(F(27, 8), F(2, 3) ** F(-3)) self.assertTypedEquals(2.0, F(4) ** F(1, 2)) + self.assertEqual(F(1, 1), +F(1, 1)) z = pow(F(-1), F(1, 2)) self.assertAlmostEqual(z.real, 0) self.assertEqual(z.imag, 1) @@ -395,6 +405,10 @@ TypeError, "unsupported operand type(s) for +: 'Fraction' and 'Decimal'", operator.add, F(3,11), Decimal('3.1415926')) + self.assertRaisesMessage( + TypeError, + "unsupported operand type(s) for +: 'Decimal' and 'Fraction'", + operator.add, Decimal('3.1415926'), F(3,11)) def testComparisons(self): self.assertTrue(F(1, 2) < F(2, 3)) @@ -538,9 +552,12 @@ self.assertEqual("7", str(F(7, 1))) def testHash(self): + hmod = sys.hash_info.modulus + hinf = sys.hash_info.inf self.assertEqual(hash(2.5), hash(F(5, 2))) self.assertEqual(hash(10**50), hash(F(10**50))) self.assertNotEqual(hash(float(10**23)), hash(F(10**23))) + self.assertEqual(hinf, hash(F(1, hmod))) # Check that __hash__ produces the same value as hash(), for # consistency with int and Decimal. (See issue #10356.) self.assertEqual(hash(F(-1)), F(-1).__hash__()) @@ -574,9 +591,14 @@ def test_copy_deepcopy_pickle(self): r = F(13, 7) + dr = DummyFraction(13, 7) self.assertEqual(r, loads(dumps(r))) self.assertEqual(id(r), id(copy(r))) self.assertEqual(id(r), id(deepcopy(r))) + self.assertNotEqual(id(dr), id(copy(dr))) + self.assertNotEqual(id(dr), id(deepcopy(dr))) + self.assertTypedEquals(dr, copy(dr)) + self.assertTypedEquals(dr, deepcopy(dr)) def test_slots(self): # Issue 4998 -- Repository URL: http://hg.python.org/cpython

1 0