Mailman 3 November 2013 - Python-checkins

cpython: Issue #17897: Optimized unpickle prefetching.
by serhiy.storchaka 30 Nov '13

30 Nov '13

http://hg.python.org/cpython/rev/d565310e7ae3 changeset: 87654:d565310e7ae3 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Nov 30 23:15:38 2013 +0200 summary: Issue #17897: Optimized unpickle prefetching. files: Misc/NEWS | 2 + Modules/_pickle.c | 56 +++++++++++++++-------------------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,8 @@ Library ------- +- Issue #17897: Optimized unpickle prefetching. + - Issue #3693: Make the error message more helpful when the array.array() constructor is given a str. Move the array module typecode documentation to the docstring of the constructor. diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -1121,7 +1121,7 @@ _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n) { PyObject *data; - Py_ssize_t read_size, prefetched_size = 0; + Py_ssize_t read_size; assert(self->read != NULL); @@ -1134,46 +1134,38 @@ Py_DECREF(empty_tuple); } else { - PyObject *len = PyLong_FromSsize_t(n); - if (len == NULL) - return -1; - data = _Pickle_FastCall(self->read, len); - } - if (data == NULL) - return -1; - - /* Prefetch some data without advancing the file pointer, if possible */ - if (self->peek) { - PyObject *len, *prefetched; - len = PyLong_FromSsize_t(PREFETCH); - if (len == NULL) { - Py_DECREF(data); - return -1; - } - prefetched = _Pickle_FastCall(self->peek, len); - if (prefetched == NULL) { - if (PyErr_ExceptionMatches(PyExc_NotImplementedError)) { + PyObject *len; + /* Prefetch some data without advancing the file pointer, if possible */ + if (self->peek && n < PREFETCH) { + len = PyLong_FromSsize_t(PREFETCH); + if (len == NULL) + return -1; + data = _Pickle_FastCall(self->peek, len); + if (data == NULL) { + if (!PyErr_ExceptionMatches(PyExc_NotImplementedError)) + return -1; /* peek() is probably not supported by the given file object */ PyErr_Clear(); Py_CLEAR(self->peek); } else { + read_size = _Unpickler_SetStringInput(self, data); Py_DECREF(data); - return -1; + self->prefetched_idx = 0; + if (n <= read_size) + return n; } } - else { - assert(PyBytes_Check(prefetched)); - prefetched_size = PyBytes_GET_SIZE(prefetched); - PyBytes_ConcatAndDel(&data, prefetched); - if (data == NULL) - return -1; - } - } - - read_size = _Unpickler_SetStringInput(self, data) - prefetched_size; + len = PyLong_FromSsize_t(n); + if (len == NULL) + return -1; + data = _Pickle_FastCall(self->read, len); + } + if (data == NULL) + return -1; + + read_size = _Unpickler_SetStringInput(self, data); Py_DECREF(data); - self->prefetched_idx = read_size; return read_size; } -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19088: Merge with 3.3.
by alexandre.vassalotti 30 Nov '13

30 Nov '13

http://hg.python.org/cpython/rev/1ceb6f84b617 changeset: 87653:1ceb6f84b617 parent: 87651:a0ec33efa743 parent: 87652:96d1207d33d0 user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Sat Nov 30 01:05:51 2013 -0800 summary: Issue #19088: Merge with 3.3. files: Misc/NEWS | 3 ++ Objects/typeobject.c | 43 +++++++++++++++++-------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,9 @@ constructor is given a str. Move the array module typecode documentation to the docstring of the constructor. +- Issue #19088: Fixed incorrect caching of the copyreg module in + object.__reduce__() and object.__reduce_ex__(). + - Issue #19698: Removed exec_module() methods from importlib.machinery.BuiltinImporter and ExtensionFileLoader. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -7,10 +7,6 @@ #include <ctype.h> -/* Cached lookup of the copyreg module, for faster __reduce__ calls */ - -static PyObject *cached_copyreg_module = NULL; - /* Support type attribute cache */ /* The cache can keep references to the names alive for longer than @@ -79,9 +75,6 @@ _PyType_Fini(void) { PyType_ClearCache(); - /* Need to forget our obsolete instance of the copyreg module at - * interpreter shutdown (issue #17408). */ - Py_CLEAR(cached_copyreg_module); } void @@ -3390,19 +3383,29 @@ static PyObject * import_copyreg(void) { - static PyObject *copyreg_str; - - if (!copyreg_str) { - copyreg_str = PyUnicode_InternFromString("copyreg"); - if (copyreg_str == NULL) - return NULL; - } - if (!cached_copyreg_module) { - cached_copyreg_module = PyImport_Import(copyreg_str); - } - - Py_XINCREF(cached_copyreg_module); - return cached_copyreg_module; + PyObject *copyreg_str; + PyObject *copyreg_module; + PyInterpreterState *interp = PyThreadState_GET()->interp; + _Py_IDENTIFIER(copyreg); + + copyreg_str = _PyUnicode_FromId(&PyId_copyreg); + if (copyreg_str == NULL) { + return NULL; + } + /* Try to fetch cached copy of copyreg from sys.modules first in an + attempt to avoid the import overhead. Previously this was implemented + by storing a reference to the cached module in a static variable, but + this broke when multiple embeded interpreters were in use (see issue + #17408 and #19088). */ + copyreg_module = PyDict_GetItemWithError(interp->modules, copyreg_str); + if (copyreg_module != NULL) { + Py_INCREF(copyreg_module); + return copyreg_module; + } + if (PyErr_Occurred()) { + return NULL; + } + return PyImport_Import(copyreg_str); } Py_LOCAL(PyObject *) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19088: Fix incorrect caching of the copyreg module.
by alexandre.vassalotti 30 Nov '13

30 Nov '13

http://hg.python.org/cpython/rev/96d1207d33d0 changeset: 87652:96d1207d33d0 branch: 3.3 parent: 87645:63f3e8670fa6 user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Sat Nov 30 00:53:09 2013 -0800 summary: Issue #19088: Fix incorrect caching of the copyreg module. This fix does not cause any degradation in performance. files: Misc/NEWS | 3 ++ Objects/typeobject.c | 43 +++++++++++++++++-------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,9 @@ Library ------- +- Issue #19088: Fixed incorrect caching of the copyreg module in + object.__reduce__() and object.__reduce_ex__(). + - Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with virtual interface. Original patch by Kent Frazier. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -7,10 +7,6 @@ #include <ctype.h> -/* Cached lookup of the copyreg module, for faster __reduce__ calls */ - -static PyObject *cached_copyreg_module = NULL; - /* Support type attribute cache */ /* The cache can keep references to the names alive for longer than @@ -73,9 +69,6 @@ _PyType_Fini(void) { PyType_ClearCache(); - /* Need to forget our obsolete instance of the copyreg module at - * interpreter shutdown (issue #17408). */ - Py_CLEAR(cached_copyreg_module); } void @@ -3348,19 +3341,29 @@ static PyObject * import_copyreg(void) { - static PyObject *copyreg_str; - - if (!copyreg_str) { - copyreg_str = PyUnicode_InternFromString("copyreg"); - if (copyreg_str == NULL) - return NULL; - } - if (!cached_copyreg_module) { - cached_copyreg_module = PyImport_Import(copyreg_str); - } - - Py_XINCREF(cached_copyreg_module); - return cached_copyreg_module; + PyObject *copyreg_str; + PyObject *copyreg_module; + PyInterpreterState *interp = PyThreadState_GET()->interp; + _Py_IDENTIFIER(copyreg); + + copyreg_str = _PyUnicode_FromId(&PyId_copyreg); + if (copyreg_str == NULL) { + return NULL; + } + /* Try to fetch cached copy of copyreg from sys.modules first in an + attempt to avoid the import overhead. Previously this was implemented + by storing a reference to the cached module in a static variable, but + this broke when multiple embeded interpreters were in use (see issue + #17408 and #19088). */ + copyreg_module = PyDict_GetItemWithError(interp->modules, copyreg_str); + if (copyreg_module != NULL) { + Py_INCREF(copyreg_module); + return copyreg_module; + } + if (PyErr_Occurred()) { + return NULL; + } + return PyImport_Import(copyreg_str); } static PyObject * -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (2a679870d7d2): sum=0
by solipsis＠pitrou.net 30 Nov '13

30 Nov '13

results for 2a679870d7d2 on branch "default" -------------------------------------------- test_site leaked [-2, 0, 2] references, sum=0 test_site leaked [-2, 0, 2] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogpU80bI', '-x']

1 0

cpython: Issue #19728: don't be sensitive to line endings
by nick.coghlan 30 Nov '13

30 Nov '13

http://hg.python.org/cpython/rev/a0ec33efa743 changeset: 87651:a0ec33efa743 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sat Nov 30 18:35:32 2013 +1000 summary: Issue #19728: don't be sensitive to line endings files: Lib/test/test_venv.py | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -340,17 +340,13 @@ # if we get unexpected results err = err.decode("latin-1") # Force to text, prevent decoding errors self.assertEqual(err, "") - # Being really specific regarding the expected behaviour for the + # Being fairly specific regarding the expected behaviour for the # initial bundling phase in Python 3.4. If the output changes in - # future pip versions, this test can be relaxed a bit. + # future pip versions, this test can likely be relaxed further. out = out.decode("latin-1") # Force to text, prevent decoding errors - expected_output = textwrap.dedent("""\ - Uninstalling pip: - Successfully uninstalled pip - Uninstalling setuptools: - Successfully uninstalled setuptools - """) - self.assertEqual(out, expected_output) + self.assertIn("Successfully uninstalled pip", out) + self.assertIn("Successfully uninstalled setuptools", out) + # Check pip is now gone from the virtual environment self.assert_pip_not_installed() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19726: actually running 'hg add' helps...
by nick.coghlan 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/04088790c077 changeset: 87650:04088790c077 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sat Nov 30 17:45:09 2013 +1000 summary: Issue #19726: actually running 'hg add' helps... files: Lib/ensurepip/_uninstall.py | 30 +++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/Lib/ensurepip/_uninstall.py b/Lib/ensurepip/_uninstall.py new file mode 100644 --- /dev/null +++ b/Lib/ensurepip/_uninstall.py @@ -0,0 +1,30 @@ +"""Basic pip uninstallation support, helper for the Windows uninstaller""" + +import argparse +import ensurepip + + +def main(): + parser = argparse.ArgumentParser(prog="python -m ensurepip._uninstall") + parser.add_argument( + "--version", + action="version", + version="pip {}".format(ensurepip.version()), + help="Show the version of pip this will attempt to uninstall.", + ) + parser.add_argument( + "-v", "--verbose", + action="count", + default=0, + dest="verbosity", + help=("Give more output. Option is additive, and can be used up to 3 " + "times."), + ) + + args = parser.parse_args() + + ensurepip._uninstall(verbosity=args.verbosity) + + +if __name__ == "__main__": + main() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19728: add private ensurepip._uninstall CLI
by nick.coghlan 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/7dc4bf283857 changeset: 87649:7dc4bf283857 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sat Nov 30 17:15:09 2013 +1000 summary: Issue #19728: add private ensurepip._uninstall CLI MvL would like to be able to preserve CPython's existing clean uninstall behaviour on Windows before enabling the pip installation option by default. This private CLI means running "python -m ensurepip._uninstall" will remove pip and setuptools before proceeding with the rest of the uninstallation process. If the version of pip differs from the one bootstrapped by CPython, then the uninstallation helper will leave it alone (just like any other pip installed packages) files: Lib/ensurepip/__init__.py | 26 ++++++++- Lib/test/test_ensurepip.py | 75 ++++++++++++++++++++++++++ Lib/test/test_venv.py | 66 +++++++++++++++++----- 3 files changed, 149 insertions(+), 18 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -20,9 +20,10 @@ ] -def _run_pip(args, additional_paths): +def _run_pip(args, additional_paths=None): # Add our bundled software to the sys.path so we can import it - sys.path = additional_paths + sys.path + if additional_paths is not None: + sys.path = additional_paths + sys.path # Install the bundled software import pip @@ -90,3 +91,24 @@ args += ["-" + "v" * verbosity] _run_pip(args + [p[0] for p in _PROJECTS], additional_paths) + +def _uninstall(*, verbosity=0): + """Helper to support a clean default uninstall process on Windows""" + # Nothing to do if pip was never installed, or has been removed + try: + import pip + except ImportError: + return + + # If the pip version doesn't match the bundled one, leave it alone + if pip.__version__ != _PIP_VERSION: + msg = ("ensurepip will only uninstall a matching pip " + "({!r} installed, {!r} bundled)") + raise RuntimeError(msg.format(pip.__version__, _PIP_VERSION)) + + # Construct the arguments to be passed to the pip command + args = ["uninstall", "-y"] + if verbosity: + args += ["-" + "v" * verbosity] + + _run_pip(args + [p[0] for p in reversed(_PROJECTS)]) diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py --- a/Lib/test/test_ensurepip.py +++ b/Lib/test/test_ensurepip.py @@ -4,6 +4,8 @@ import test.support import os import os.path +import contextlib +import sys class TestEnsurePipVersion(unittest.TestCase): @@ -122,6 +124,79 @@ def test_altinstall_default_pip_conflict(self): with self.assertRaises(ValueError): ensurepip.bootstrap(altinstall=True, default_pip=True) + self.run_pip.assert_not_called() + +(a)contextlib.contextmanager +def fake_pip(version=ensurepip._PIP_VERSION): + if version is None: + pip = None + else: + class FakePip(): + __version__ = version + pip = FakePip() + sentinel = object() + orig_pip = sys.modules.get("pip", sentinel) + sys.modules["pip"] = pip + try: + yield pip + finally: + if orig_pip is sentinel: + del sys.modules["pip"] + else: + sys.modules["pip"] = orig_pip + +class TestUninstall(unittest.TestCase): + + def setUp(self): + run_pip_patch = unittest.mock.patch("ensurepip._run_pip") + self.run_pip = run_pip_patch.start() + self.addCleanup(run_pip_patch.stop) + + def test_uninstall_skipped_when_not_installed(self): + with fake_pip(None): + ensurepip._uninstall() + self.run_pip.assert_not_called() + + def test_uninstall_fails_with_wrong_version(self): + with fake_pip("not a valid version"): + with self.assertRaises(RuntimeError): + ensurepip._uninstall() + self.run_pip.assert_not_called() + + + def test_uninstall(self): + with fake_pip(): + ensurepip._uninstall() + + self.run_pip.assert_called_once_with( + ["uninstall", "-y", "pip", "setuptools"] + ) + + def test_uninstall_with_verbosity_1(self): + with fake_pip(): + ensurepip._uninstall(verbosity=1) + + self.run_pip.assert_called_once_with( + ["uninstall", "-y", "-v", "pip", "setuptools"] + ) + + def test_uninstall_with_verbosity_2(self): + with fake_pip(): + ensurepip._uninstall(verbosity=2) + + self.run_pip.assert_called_once_with( + ["uninstall", "-y", "-vv", "pip", "setuptools"] + ) + + def test_uninstall_with_verbosity_3(self): + with fake_pip(): + ensurepip._uninstall(verbosity=3) + + self.run_pip.assert_called_once_with( + ["uninstall", "-y", "-vvv", "pip", "setuptools"] + ) + + if __name__ == "__main__": diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -14,6 +14,7 @@ import tempfile from test.support import (captured_stdout, captured_stderr, run_unittest, can_symlink, EnvironmentVarGuard) +import textwrap import unittest import venv try: @@ -258,30 +259,31 @@ @skipInVenv class EnsurePipTest(BaseTest): """Test venv module installation of pip.""" - - def test_no_pip_by_default(self): - shutil.rmtree(self.env_dir) - self.run_with_capture(venv.create, self.env_dir) - envpy = os.path.join(os.path.realpath(self.env_dir), self.bindir, self.exe) + def assert_pip_not_installed(self): + envpy = os.path.join(os.path.realpath(self.env_dir), + self.bindir, self.exe) try_import = 'try:\n import pip\nexcept ImportError:\n print("OK")' cmd = [envpy, '-c', try_import] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = p.communicate() - self.assertEqual(err, b"") - self.assertEqual(out.strip(), b"OK") + # We force everything to text, so unittest gives the detailed diff + # if we get unexpected results + err = err.decode("latin-1") # Force to text, prevent decoding errors + self.assertEqual(err, "") + out = out.decode("latin-1") # Force to text, prevent decoding errors + self.assertEqual(out.strip(), "OK") + + + def test_no_pip_by_default(self): + shutil.rmtree(self.env_dir) + self.run_with_capture(venv.create, self.env_dir) + self.assert_pip_not_installed() def test_explicit_no_pip(self): shutil.rmtree(self.env_dir) self.run_with_capture(venv.create, self.env_dir, with_pip=False) - envpy = os.path.join(os.path.realpath(self.env_dir), self.bindir, self.exe) - try_import = 'try:\n import pip\nexcept ImportError:\n print("OK")' - cmd = [envpy, '-c', try_import] - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - out, err = p.communicate() - self.assertEqual(err, b"") - self.assertEqual(out.strip(), b"OK") + self.assert_pip_not_installed() # Temporary skip for http://bugs.python.org/issue19744 @unittest.skipIf(ssl is None, 'pip needs SSL support') @@ -293,7 +295,8 @@ # environment settings don't cause venv to fail. envvars["PYTHONWARNINGS"] = "e" # pip doesn't ignore environment variables when running in - # isolated mode, and we don't have an active virtualenv here + # isolated mode, and we don't have an active virtualenv here, + # we're relying on the native venv support in 3.3+ # See http://bugs.python.org/issue19734 for details del envvars["PIP_REQUIRE_VIRTUALENV"] try: @@ -304,6 +307,7 @@ details = exc.output.decode(errors="replace") msg = "{}\n\n**Subprocess Output**\n{}".format(exc, details) self.fail(msg) + # Ensure pip is available in the virtual environment envpy = os.path.join(os.path.realpath(self.env_dir), self.bindir, self.exe) cmd = [envpy, '-Im', 'pip', '--version'] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, @@ -319,6 +323,36 @@ env_dir = os.fsencode(self.env_dir).decode("latin-1") self.assertIn(env_dir, out) + # http://bugs.python.org/issue19728 + # Check the private uninstall command provided for the Windows + # installers works (at least in a virtual environment) + cmd = [envpy, '-Im', 'ensurepip._uninstall'] + with EnvironmentVarGuard() as envvars: + # pip doesn't ignore environment variables when running in + # isolated mode, and we don't have an active virtualenv here, + # we're relying on the native venv support in 3.3+ + # See http://bugs.python.org/issue19734 for details + del envvars["PIP_REQUIRE_VIRTUALENV"] + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + out, err = p.communicate() + # We force everything to text, so unittest gives the detailed diff + # if we get unexpected results + err = err.decode("latin-1") # Force to text, prevent decoding errors + self.assertEqual(err, "") + # Being really specific regarding the expected behaviour for the + # initial bundling phase in Python 3.4. If the output changes in + # future pip versions, this test can be relaxed a bit. + out = out.decode("latin-1") # Force to text, prevent decoding errors + expected_output = textwrap.dedent("""\ + Uninstalling pip: + Successfully uninstalled pip + Uninstalling setuptools: + Successfully uninstalled setuptools + """) + self.assertEqual(out, expected_output) + self.assert_pip_not_installed() + def test_main(): run_unittest(BasicTest, EnsurePipTest) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix and test pip version consistency
by nick.coghlan 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/73a84d8dc544 changeset: 87648:73a84d8dc544 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sat Nov 30 15:56:58 2013 +1000 summary: Fix and test pip version consistency files: Lib/ensurepip/__init__.py | 2 +- Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl | 0 Lib/test/test_venv.py | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,7 +12,7 @@ _SETUPTOOLS_VERSION = "1.3.2" -_PIP_VERSION = "1.5.rc1" +_PIP_VERSION = "1.5rc1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), diff --git a/Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl rename from Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -5,6 +5,7 @@ Licensed to the PSF under a contributor agreement. """ +import ensurepip import os import os.path import shutil @@ -313,8 +314,9 @@ err = err.decode("latin-1") # Force to text, prevent decoding errors self.assertEqual(err, "") out = out.decode("latin-1") # Force to text, prevent decoding errors + expected_version = "pip {}".format(ensurepip.version()) + self.assertEqual(out[:len(expected_version)], expected_version) env_dir = os.fsencode(self.env_dir).decode("latin-1") - self.assertTrue(out.startswith("pip")) self.assertIn(env_dir, out) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #3693: Fix array obscure error message when given a str.
by alexandre.vassalotti 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/2c87d3944c7a changeset: 87647:2c87d3944c7a user: Alexandre Vassalotti <alexandre(a)peadrop.com> date: Fri Nov 29 20:47:15 2013 -0800 summary: Issue #3693: Fix array obscure error message when given a str. files: Lib/test/test_array.py | 12 ++++++++ Misc/NEWS | 4 ++ Modules/arraymodule.c | 45 ++++++++++++++++++------------ 3 files changed, 43 insertions(+), 18 deletions(-) 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 @@ -1027,6 +1027,18 @@ basesize = support.calcvobjsize('Pn2Pi') support.check_sizeof(self, a, basesize) + def test_initialize_with_unicode(self): + if self.typecode != 'u': + with self.assertRaises(TypeError) as cm: + a = array.array(self.typecode, 'foo') + self.assertIn("cannot use a str", str(cm.exception)) + with self.assertRaises(TypeError) as cm: + a = array.array(self.typecode, array.array('u', 'foo')) + self.assertIn("cannot use a unicode array", str(cm.exception)) + else: + a = array.array(self.typecode, "foo") + a = array.array(self.typecode, array.array('u', 'foo')) + class StringTest(BaseTest): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,10 @@ Library ------- +- Issue #3693: Make the error message more helpful when the array.array() + constructor is given a str. Move the array module typecode documentation to + the docstring of the constructor. + - Issue #19698: Removed exec_module() methods from importlib.machinery.BuiltinImporter and ExtensionFileLoader. diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -2518,6 +2518,20 @@ if (!PyArg_ParseTuple(args, "C|O:array", &c, &initial)) return NULL; + if (initial && c != 'u') { + if (PyUnicode_Check(initial)) { + PyErr_Format(PyExc_TypeError, "cannot use a str to initialize " + "an array with typecode '%c'", c); + return NULL; + } + else if (array_Check(initial) && + ((arrayobject*)initial)->ob_descr->typecode == 'u') { + PyErr_Format(PyExc_TypeError, "cannot use a unicode array to " + "initialize an array with typecode '%c'", c); + return NULL; + } + } + if (!(initial == NULL || PyList_Check(initial) || PyByteArray_Check(initial) || PyBytes_Check(initial) @@ -2644,9 +2658,19 @@ "This module defines an object type which can efficiently represent\n\ an array of basic values: characters, integers, floating point\n\ numbers. Arrays are sequence types and behave very much like lists,\n\ -except that the type of objects stored in them is constrained. The\n\ -type is specified at object creation time by using a type code, which\n\ -is a single character. The following type codes are defined:\n\ +except that the type of objects stored in them is constrained.\n"); + +PyDoc_STRVAR(arraytype_doc, +"array(typecode [, initializer]) -> array\n\ +\n\ +Return a new array whose items are restricted by typecode, and\n\ +initialized from the optional initializer value, which must be a list,\n\ +string or iterable over elements of the appropriate type.\n\ +\n\ +Arrays represent basic values and behave very much like lists, except\n\ +the type of objects stored in them is constrained. The type is specified\n\ +at object creation time by using a type code, which is a single character.\n\ +The following type codes are defined:\n\ \n\ Type code C Type Minimum size in bytes \n\ 'b' signed integer 1 \n\ @@ -2670,21 +2694,6 @@ 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\ -"); - -PyDoc_STRVAR(arraytype_doc, -"array(typecode [, initializer]) -> array\n\ -\n\ -Return a new array whose items are restricted by typecode, and\n\ -initialized from the optional initializer value, which must be a list,\n\ -string or iterable over elements of the appropriate type.\n\ -\n\ -Arrays represent basic values and behave very much like lists, except\n\ -the type of objects stored in them is constrained.\n\ -\n\ Methods:\n\ \n\ append() -- append a new item to the end of the array\n\ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Null merge
by zach.ware 29 Nov '13

29 Nov '13

http://hg.python.org/cpython/rev/b0e180f8e588 changeset: 87646:b0e180f8e588 parent: 87643:2a679870d7d2 parent: 87645:63f3e8670fa6 user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Nov 29 21:14:22 2013 -0600 summary: Null merge files: -- Repository URL: http://hg.python.org/cpython

1 0