Mailman 3 September 2011 - Python-checkins

cpython (2.7): Issue #12981: test_multiprocessing: catch ImportError when importing
by charles-francois.natali Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/cpython/rev/c158eac8e951 changeset: 72441:c158eac8e951 branch: 2.7 parent: 72434:21e7a55cb943 user: Charles-François Natali <neologix(a)free.fr> date: Wed Sep 21 18:44:49 2011 +0200 summary: Issue #12981: test_multiprocessing: catch ImportError when importing multiprocessing.reduction, which may not be available (e.g. if the OS doesn't support FD passing over Unix domain sockets). files: Lib/test/test_multiprocessing.py | 15 ++++++++++++… [View More]+-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -33,7 +33,13 @@ import multiprocessing.heap import multiprocessing.pool -from multiprocessing import util, reduction +from multiprocessing import util + +try: + from multiprocessing import reduction + HAS_REDUCTION = True +except ImportError: + HAS_REDUCTION = False try: from multiprocessing.sharedctypes import Value, copy @@ -1526,6 +1532,7 @@ os.write(fd, data) os.close(fd) + @unittest.skipUnless(HAS_REDUCTION, "test needs multiprocessing.reduction") def test_fd_transfer(self): if self.TYPE != 'processes': self.skipTest("only makes sense with processes") @@ -1543,6 +1550,7 @@ with open(test_support.TESTFN, "rb") as f: self.assertEqual(f.read(), b"foo") + @unittest.skipUnless(HAS_REDUCTION, "test needs multiprocessing.reduction") @unittest.skipIf(sys.platform == "win32", "test semantics don't make sense on Windows") @unittest.skipIf(MAXFD <= 256, @@ -1578,6 +1586,7 @@ def _send_data_without_fd(self, conn): os.write(conn.fileno(), b"\0") + @unittest.skipUnless(HAS_REDUCTION, "test needs multiprocessing.reduction") @unittest.skipIf(sys.platform == "win32", "doesn't make sense on Windows") def test_missing_fd_transfer(self): # Check that exception is raised when received data is not @@ -1899,10 +1908,12 @@ 'multiprocessing', 'multiprocessing.connection', 'multiprocessing.heap', 'multiprocessing.managers', 'multiprocessing.pool', 'multiprocessing.process', - 'multiprocessing.reduction', 'multiprocessing.synchronize', 'multiprocessing.util' ] + if HAS_REDUCTION: + modules.append('multiprocessing.reduction') + if c_int is not None: # This module requires _ctypes modules.append('multiprocessing.sharedctypes') -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (merge default -> default): Branch merge
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/cpython/rev/210b2773c87a changeset: 72440:210b2773c87a parent: 72437:672b63aff0f4 parent: 72439:04a0af3ce5dc user: Éric Araujo <merwok(a)netwok.org> date: Wed Sep 21 16:36:08 2011 +0200 summary: Branch merge files: Doc/library/packaging.pypi.simple.rst | 2 +- Lib/packaging/command/install_dist.py | 1 - Lib/packaging/pypi/simple.py | 8 +++----- Lib/packaging/tests/test_pypi_dist.py | 2 ++ 4 files changed, 6 insertions(… [View More]+), 7 deletions(-) diff --git a/Doc/library/packaging.pypi.simple.rst b/Doc/library/packaging.pypi.simple.rst --- a/Doc/library/packaging.pypi.simple.rst +++ b/Doc/library/packaging.pypi.simple.rst @@ -24,7 +24,7 @@ prefer_final=False, prefer_source=True, \ hosts=('*',), follow_externals=False, \ mirrors_url=None, mirrors=None, timeout=15, \ - mirrors_max_tries=0, verbose=False) + mirrors_max_tries=0) *index_url* is the address of the index to use for requests. diff --git a/Lib/packaging/command/install_dist.py b/Lib/packaging/command/install_dist.py --- a/Lib/packaging/command/install_dist.py +++ b/Lib/packaging/command/install_dist.py @@ -176,7 +176,6 @@ self.installer = None self.requested = None self.no_record = None - self.no_resources = None # -- Option finalizing methods ------------------------------------- # (This is rather more involved than for most commands, diff --git a/Lib/packaging/pypi/simple.py b/Lib/packaging/pypi/simple.py --- a/Lib/packaging/pypi/simple.py +++ b/Lib/packaging/pypi/simple.py @@ -119,10 +119,9 @@ def __init__(self, index_url=DEFAULT_SIMPLE_INDEX_URL, prefer_final=False, prefer_source=True, hosts=DEFAULT_HOSTS, follow_externals=False, mirrors_url=None, mirrors=None, - timeout=SOCKET_TIMEOUT, mirrors_max_tries=0, verbose=False): + timeout=SOCKET_TIMEOUT, mirrors_max_tries=0): super(Crawler, self).__init__(prefer_final, prefer_source) self.follow_externals = follow_externals - self.verbose = verbose # mirroring attributes. parsed = urllib.parse.urlparse(index_url) @@ -322,9 +321,8 @@ infos = get_infos_from_url(link, project_name, is_external=self.index_url not in url) except CantParseArchiveName as e: - if self.verbose: - logger.warning( - "version has not been parsed: %s", e) + logger.warning( + "version has not been parsed: %s", e) else: self._register_release(release_info=infos) else: diff --git a/Lib/packaging/tests/test_pypi_dist.py b/Lib/packaging/tests/test_pypi_dist.py --- a/Lib/packaging/tests/test_pypi_dist.py +++ b/Lib/packaging/tests/test_pypi_dist.py @@ -1,6 +1,7 @@ """Tests for the packaging.pypi.dist module.""" import os +import shutil from packaging.version import VersionPredicate from packaging.pypi.dist import (ReleaseInfo, ReleasesList, DistInfo, split_archive_name, get_infos_from_url) @@ -185,6 +186,7 @@ dist2 = Dist(url=url) # doing an unpack dist2_there = dist2.unpack() + self.addCleanup(shutil.rmtree, dist2_there) dist2_result = os.listdir(dist2_there) self.assertIn('paf', dist2_result) os.remove(os.path.join(dist2_there, 'paf')) -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython: Remove two unneeded attributes in packaging
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/cpython/rev/04a0af3ce5dc changeset: 72439:04a0af3ce5dc user: Éric Araujo <merwok(a)netwok.org> date: Wed Sep 21 16:28:03 2011 +0200 summary: Remove two unneeded attributes in packaging files: Doc/library/packaging.pypi.simple.rst | 2 +- Lib/packaging/command/install_dist.py | 1 - Lib/packaging/pypi/simple.py | 8 +++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Doc/library/packaging.pypi.simple.rst b/Doc/… [View More]library/packaging.pypi.simple.rst --- a/Doc/library/packaging.pypi.simple.rst +++ b/Doc/library/packaging.pypi.simple.rst @@ -24,7 +24,7 @@ prefer_final=False, prefer_source=True, \ hosts=('*',), follow_externals=False, \ mirrors_url=None, mirrors=None, timeout=15, \ - mirrors_max_tries=0, verbose=False) + mirrors_max_tries=0) *index_url* is the address of the index to use for requests. diff --git a/Lib/packaging/command/install_dist.py b/Lib/packaging/command/install_dist.py --- a/Lib/packaging/command/install_dist.py +++ b/Lib/packaging/command/install_dist.py @@ -176,7 +176,6 @@ self.installer = None self.requested = None self.no_record = None - self.no_resources = None # -- Option finalizing methods ------------------------------------- # (This is rather more involved than for most commands, diff --git a/Lib/packaging/pypi/simple.py b/Lib/packaging/pypi/simple.py --- a/Lib/packaging/pypi/simple.py +++ b/Lib/packaging/pypi/simple.py @@ -119,10 +119,9 @@ def __init__(self, index_url=DEFAULT_SIMPLE_INDEX_URL, prefer_final=False, prefer_source=True, hosts=DEFAULT_HOSTS, follow_externals=False, mirrors_url=None, mirrors=None, - timeout=SOCKET_TIMEOUT, mirrors_max_tries=0, verbose=False): + timeout=SOCKET_TIMEOUT, mirrors_max_tries=0): super(Crawler, self).__init__(prefer_final, prefer_source) self.follow_externals = follow_externals - self.verbose = verbose # mirroring attributes. parsed = urllib.parse.urlparse(index_url) @@ -322,9 +321,8 @@ infos = get_infos_from_url(link, project_name, is_external=self.index_url not in url) except CantParseArchiveName as e: - if self.verbose: - logger.warning( - "version has not been parsed: %s", e) + logger.warning( + "version has not been parsed: %s", e) else: self._register_release(release_info=infos) else: -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython: Squash last tempdir leak in packaging tests.
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/cpython/rev/69915be386b2 changeset: 72438:69915be386b2 parent: 72415:b194af345cb5 user: Éric Araujo <merwok(a)netwok.org> date: Mon Sep 19 20:57:52 2011 +0200 summary: Squash last tempdir leak in packaging tests. Sweet taste of victory! Alexis, you can fix the threads leaks :) files: Lib/packaging/tests/test_pypi_dist.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/packaging/tests/test_pypi_dist.py b/Lib/… [View More]

1 0

distutils2: Remove two unneeded attributes
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/distutils2/rev/586dd5bb494c changeset: 1183:586dd5bb494c user: Éric Araujo <merwok(a)netwok.org> date: Wed Sep 21 16:31:25 2011 +0200 summary: Remove two unneeded attributes files: distutils2/command/install_dist.py | 1 - distutils2/pypi/simple.py | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/distutils2/command/install_dist.py b/distutils2/command/install_dist.py --- a/distutils2/command/install_dist.… [View More]

1 0

distutils2: pep8 compat.py
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/distutils2/rev/5434147ae874 changeset: 1184:5434147ae874 user: Éric Araujo <merwok(a)netwok.org> date: Wed Sep 21 16:31:52 2011 +0200 summary: pep8 compat.py files: distutils2/compat.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/distutils2/compat.py b/distutils2/compat.py --- a/distutils2/compat.py +++ b/distutils2/compat.py @@ -74,6 +74,7 @@ _cookie_re = re.compile("coding[:=]\s*([-\w.]+)") + def … [View More]

1 0

distutils2: Fix name and attribute errors
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/distutils2/rev/248b102b7d69 changeset: 1185:248b102b7d69 user: Éric Araujo <merwok(a)netwok.org> date: Wed Sep 21 16:33:53 2011 +0200 summary: Fix name and attribute errors files: distutils2/_backport/tests/test_sysconfig.py | 2 +- distutils2/pypi/wrapper.py | 4 ++-- distutils2/tests/test_dist.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distutils2/_backport/tests/… [View More]

1 0

distutils2: Improve tests.sh.
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/distutils2/rev/fce523641deb changeset: 1186:fce523641deb user: Éric Araujo <merwok(a)netwok.org> date: Wed Sep 21 16:35:33 2011 +0200 summary: Improve tests.sh. - When a run fails, re-run without quiet mode (wow automation it’s incredible) - 3.x versions are not tested, as this branch of d2 is only for 2.x (I’ll push a branch for 3.1-3.2 later) files: tests.sh | 68 +++++++++++--------------------------------- 1 files changed, 17 … [View More]insertions(+), 51 deletions(-) diff --git a/tests.sh b/tests.sh --- a/tests.sh +++ b/tests.sh @@ -1,82 +1,48 @@ #!/bin/sh -echo -n "Running tests for Python 2.4... " -rm -f distutils2/_backport/_hashlib.so +echo -n "Running tests with Python 2.4... " python2.4 setup.py build_ext -f -q 2> /dev/null > /dev/null -python2.4 -Wd runtests.py -q 2> /dev/null +python2.4 -Wd runtests.py -q if [ $? -ne 0 ];then - echo Failed - rm -f distutils2/_backport/_hashlib.so + echo Failed, re-running + python2.4 -Wd runtests.py exit 1 else echo Success fi -echo -n "Running tests for Python 2.5... " -python2.5 -Wd runtests.py -q 2> /dev/null +echo -n "Running tests with Python 2.5... " +python2.5 -Wd runtests.py -q if [ $? -ne 0 ];then - echo Failed + echo Failed, re-running + python2.5 -Wd runtests.py exit 1 else echo Success fi -echo -n "Running tests for Python 2.6... " -python2.6 -Wd runtests.py -q 2> /dev/null +echo -n "Running tests with Python 2.6... " +python2.6 -Wd runtests.py -q if [ $? -ne 0 ];then - echo Failed + echo Failed, re-running + python2.6 -Wd runtests.py exit 1 else echo Success fi -echo -n "Running tests for Python 2.7... " -python2.7 -Wd -bb -3 runtests.py -q 2> /dev/null +echo -n "Running tests with Python 2.7... " +python2.7 -Wd -bb -3 runtests.py -q if [ $? -ne 0 ];then - echo Failed + echo Failed, re-running + python2.7 -Wd -bb -3 runtests.py exit 1 else echo Success fi -LIB=$( python3.1 -c "from distutils.util import get_platform; import sys; print('lib.%s-%s' % (get_platform(), sys.version[0:3]))" ) - - -echo -n "Running tests for Python 3.1... " -python3.1 setup.py build -q 2> /dev/null > /dev/null -cp runtests.py build/ -cd build -PYTHONPATH=${LIB} python3.1 runtests.py -q 2> /dev/null - if [ $? -ne 0 ];then echo Failed exit 1 else - echo Success + echo "Good job, commit now! (or add tests)" fi - -echo -n "Running tests for Python 3.2... " -python3.2 setup.py build -q 2> /dev/null > /dev/null -cp runtests.py build/ -cd build -PYTHONPATH=${LIB} python3.2 runtests.py -q 2> /dev/null - -if [ $? -ne 0 ];then - echo Failed - exit 1 -else - echo Success -fi - -echo -n "Running tests for Python 3.3... " -python3.2 setup.py build -q 2> /dev/null > /dev/null -cp runtests.py build/ -cd build -PYTHONPATH=${LIB} python3.3 runtests.py -q 2> /dev/null - -if [ $? -ne 0 ];then - echo Failed - exit 1 -else - echo Success -fi -echo "Good job, commit now! (or add tests)" -- Repository URL: http://hg.python.org/distutils2 [View Less]

1 0

distutils2: Squash last remaining tempdir leak in tests
by eric.araujo Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/distutils2/rev/2f7040100a12 changeset: 1182:2f7040100a12 user: Éric Araujo <merwok(a)netwok.org> date: Mon Sep 19 20:59:26 2011 +0200 summary: Squash last remaining tempdir leak in tests files: distutils2/tests/test_pypi_dist.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/distutils2/tests/test_pypi_dist.py b/distutils2/tests/test_pypi_dist.py --- a/distutils2/tests/test_pypi_dist.py +++ b/distutils2/tests/… [View More]

1 0

cpython: Issue #1172711: Add 'long long' support to the array module.
by meador.inge Sept. 21, 2011

Sept. 21, 2011

http://hg.python.org/cpython/rev/15659e0e2b2e changeset: 72430:15659e0e2b2e user: Meador Inge <meadori(a)gmail.com> date: Tue Sep 20 19:55:51 2011 -0500 summary: Issue #1172711: Add 'long long' support to the array module. Initial patch by Oren Tirosh and Hirokazu Yamamoto. files: Doc/library/array.rst | 66 ++++++++++++++---------- Lib/test/test_array.py | 21 +++++++ Misc/NEWS | 3 + Modules/arraymodule.c | 79 +++++++++++++++++++++++++++++- … [View More]4 files changed, 141 insertions(+), 28 deletions(-) diff --git a/Doc/library/array.rst b/Doc/library/array.rst --- a/Doc/library/array.rst +++ b/Doc/library/array.rst @@ -14,37 +14,49 @@ :dfn:`type code`, which is a single character. The following type codes are defined: -+-----------+----------------+-------------------+-----------------------+ -| Type code | C Type | Python Type | Minimum size in bytes | -+===========+================+===================+=======================+ -| ``'b'`` | signed char | int | 1 | -+-----------+----------------+-------------------+-----------------------+ -| ``'B'`` | unsigned char | int | 1 | -+-----------+----------------+-------------------+-----------------------+ -| ``'u'`` | Py_UNICODE | Unicode character | 2 (see note) | -+-----------+----------------+-------------------+-----------------------+ -| ``'h'`` | signed short | int | 2 | -+-----------+----------------+-------------------+-----------------------+ -| ``'H'`` | unsigned short | int | 2 | -+-----------+----------------+-------------------+-----------------------+ -| ``'i'`` | signed int | int | 2 | -+-----------+----------------+-------------------+-----------------------+ -| ``'I'`` | unsigned int | int | 2 | -+-----------+----------------+-------------------+-----------------------+ -| ``'l'`` | signed long | int | 4 | -+-----------+----------------+-------------------+-----------------------+ -| ``'L'`` | unsigned long | int | 4 | -+-----------+----------------+-------------------+-----------------------+ -| ``'f'`` | float | float | 4 | -+-----------+----------------+-------------------+-----------------------+ -| ``'d'`` | double | float | 8 | -+-----------+----------------+-------------------+-----------------------+ ++-----------+--------------------+-------------------+-----------------------+-------+ +| Type code | C Type | Python Type | Minimum size in bytes | Notes | ++===========+====================+===================+=======================+=======+ +| ``'b'`` | signed char | int | 1 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'B'`` | unsigned char | int | 1 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'u'`` | Py_UNICODE | Unicode character | 2 | \(1) | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'h'`` | signed short | int | 2 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'H'`` | unsigned short | int | 2 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'i'`` | signed int | int | 2 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'I'`` | unsigned int | int | 2 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'l'`` | signed long | int | 4 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'L'`` | unsigned long | int | 4 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'q'`` | signed long long | int | 8 | \(2) | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'Q'`` | unsigned long long | int | 8 | \(2) | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'f'`` | float | float | 4 | | ++-----------+--------------------+-------------------+-----------------------+-------+ +| ``'d'`` | double | float | 8 | | ++-----------+--------------------+-------------------+-----------------------+-------+ -.. note:: +Notes: - The ``'u'`` typecode corresponds to Python's unicode character. On narrow +(1) + The ``'u'`` type code corresponds to Python's unicode character. On narrow Unicode builds this is 2-bytes, on wide builds this is 4-bytes. +(2) + The ``'q'`` and ``'Q'`` type codes are available only if + the platform C compiler used to build Python supports C :ctype:`long long`, + or, on Windows, :ctype:`__int64`. + + .. versionadded:: 3.3 + The actual representation of values is determined by the machine architecture (strictly speaking, by the C implementation). The actual size can be accessed through the :attr:`itemsize` attribute. diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -16,6 +16,13 @@ import array from array import _array_reconstructor as array_reconstructor +try: + # Try to determine availability of long long independently + # of the array module under test + struct.calcsize('@q') + have_long_long = True +except struct.error: + have_long_long = False class ArraySubclass(array.array): pass @@ -26,6 +33,8 @@ tests = [] # list to accumulate all tests typecodes = "ubBhHiIlLfd" +if have_long_long: + typecodes += 'qQ' class BadConstructorTest(unittest.TestCase): @@ -1205,6 +1214,18 @@ minitemsize = 4 tests.append(UnsignedLongTest) +(a)unittest.skipIf(not have_long_long, 'need long long support') +class LongLongTest(SignedNumberTest): + typecode = 'q' + minitemsize = 8 +tests.append(LongLongTest) + +(a)unittest.skipIf(not have_long_long, 'need long long support') +class UnsignedLongLongTest(UnsignedNumberTest): + typecode = 'Q' + minitemsize = 8 +tests.append(UnsignedLongLongTest) + class FPTest(NumberTest): example = [-42.0, 0, 42, 1e5, -1e10] smallerexample = [-42.0, 0, 42, 1e5, -2e10] diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1287,6 +1287,9 @@ Extension Modules ----------------- +- Issue #1172711: Add 'long long' support to the array module. + Initial patch by Oren Tirosh and Hirokazu Yamamoto. + - Issue #12483: ctypes: Fix a crash when the destruction of a callback object triggers the garbage collector. diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -356,6 +356,59 @@ return 0; } +#ifdef HAVE_LONG_LONG + +static PyObject * +q_getitem(arrayobject *ap, Py_ssize_t i) +{ + return PyLong_FromLongLong(((PY_LONG_LONG *)ap->ob_item)[i]); +} + +static int +q_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) +{ + PY_LONG_LONG x; + if (!PyArg_Parse(v, "L;array item must be integer", &x)) + return -1; + if (i >= 0) + ((PY_LONG_LONG *)ap->ob_item)[i] = x; + return 0; +} + +static PyObject * +QQ_getitem(arrayobject *ap, Py_ssize_t i) +{ + return PyLong_FromUnsignedLongLong( + ((unsigned PY_LONG_LONG *)ap->ob_item)[i]); +} + +static int +QQ_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) +{ + unsigned PY_LONG_LONG x; + if (PyLong_Check(v)) { + x = PyLong_AsUnsignedLongLong(v); + if (x == (unsigned PY_LONG_LONG) -1 && PyErr_Occurred()) + return -1; + } + else { + PY_LONG_LONG y; + if (!PyArg_Parse(v, "L;array item must be integer", &y)) + return -1; + if (y < 0) { + PyErr_SetString(PyExc_OverflowError, + "unsigned long long is less than minimum"); + return -1; + } + x = (unsigned PY_LONG_LONG)y; + } + + if (i >= 0) + ((unsigned PY_LONG_LONG *)ap->ob_item)[i] = x; + return 0; +} +#endif + static PyObject * f_getitem(arrayobject *ap, Py_ssize_t i) { @@ -406,6 +459,10 @@ {'I', sizeof(int), II_getitem, II_setitem, "I", 1, 0}, {'l', sizeof(long), l_getitem, l_setitem, "l", 1, 1}, {'L', sizeof(long), LL_getitem, LL_setitem, "L", 1, 0}, +#ifdef HAVE_LONG_LONG + {'q', sizeof(PY_LONG_LONG), q_getitem, q_setitem, "q", 1, 1}, + {'Q', sizeof(PY_LONG_LONG), QQ_getitem, QQ_setitem, "Q", 1, 0}, +#endif {'f', sizeof(float), f_getitem, f_setitem, "f", 0, 0}, {'d', sizeof(double), d_getitem, d_setitem, "d", 0, 0}, {'\0', 0, 0, 0, 0, 0, 0} /* Sentinel */ @@ -1655,6 +1712,16 @@ intsize = sizeof(long); is_signed = 0; break; +#if HAVE_LONG_LONG + case 'q': + intsize = sizeof(PY_LONG_LONG); + is_signed = 1; + break; + case 'Q': + intsize = sizeof(PY_LONG_LONG); + is_signed = 0; + break; +#endif default: return UNKNOWN_FORMAT; } @@ -2501,7 +2568,11 @@ } } PyErr_SetString(PyExc_ValueError, +#ifdef HAVE_LONG_LONG + "bad typecode (must be b, B, u, h, H, i, I, l, L, q, Q, f or d)"); +#else "bad typecode (must be b, B, u, h, H, i, I, l, L, f or d)"); +#endif return NULL; } @@ -2524,12 +2595,18 @@ 'I' unsigned integer 2 \n\ 'l' signed integer 4 \n\ 'L' unsigned integer 4 \n\ + 'q' signed integer 8 (see note) \n\ + 'Q' unsigned integer 8 (see note) \n\ 'f' floating point 4 \n\ 'd' floating point 8 \n\ \n\ -NOTE: The 'u' typecode corresponds to Python's unicode character. On \n\ +NOTE: The 'u' type code corresponds to Python's unicode character. On \n\ narrow builds this is 2-bytes on wide builds this is 4-bytes.\n\ \n\ +NOTE: The 'q' and 'Q' type codes are only available if the platform \n\ +C compiler used to build Python supports 'long long', or, on Windows, \n\ +'__int64'.\n\ +\n\ The constructor is:\n\ \n\ array(typecode [, initializer]) -- create a new array\n\ -- Repository URL: http://hg.python.org/cpython [View Less]

2 1