Mailman 3 January 2012 - Python-checkins

cpython (2.7): #13506 Add '' to path for interactive interpreter by adding with_cwd parameter
by terry.reedy 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/1b5abba0c808 changeset: 74692:1b5abba0c808 branch: 2.7 parent: 74678:690d5978bd21 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jan 31 02:09:25 2012 -0500 summary: #13506 Add '' to path for interactive interpreter by adding with_cwd parameter to PyShell.PyShell.transfer_path() and changing elsewhere as needed. Original patches by Marco Scataglini and Roger Serwy. files: Lib/idlelib/PyShell.py | 19 +++++++++++++------ Lib/idlelib/ScriptBinding.py | 5 ++--- Misc/ACKS | 2 ++ Misc/NEWS | 3 +++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -423,11 +423,11 @@ self.rpcclt.register("flist", self.tkconsole.flist) self.rpcclt.register("linecache", linecache) self.rpcclt.register("interp", self) - self.transfer_path() + self.transfer_path(with_cwd=True) self.poll_subprocess() return self.rpcclt - def restart_subprocess(self): + def restart_subprocess(self, with_cwd=False): if self.restarting: return self.rpcclt self.restarting = True @@ -451,7 +451,7 @@ except socket.timeout, err: self.display_no_subprocess_error() return None - self.transfer_path() + self.transfer_path(with_cwd=with_cwd) # annotate restart in shell window and mark it console.text.delete("iomark", "end-1c") if was_executing: @@ -501,12 +501,18 @@ except OSError: return - def transfer_path(self): + def transfer_path(self, with_cwd=False): + if with_cwd: # Issue 13506 + path = [''] # include Current Working Directory + path.extend(sys.path) + else: + path = sys.path + self.runcommand("""if 1: import sys as _sys _sys.path = %r del _sys - \n""" % (sys.path,)) + \n""" % (path,)) active_seq = None @@ -1209,7 +1215,8 @@ self.text.see("restart") def restart_shell(self, event=None): - self.interp.restart_subprocess() + "Callback for Run/Restart Shell Cntl-F6" + self.interp.restart_subprocess(with_cwd=True) def showprompt(self): self.resetoutput() diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -146,10 +146,9 @@ return 'break' if not self.tabnanny(filename): return 'break' - shell = self.shell - interp = shell.interp + interp = self.shell.interp if PyShell.use_subprocess: - shell.restart_shell() + interp.restart_subprocess(with_cwd=False) dirname = os.path.dirname(filename) # XXX Too often this discards arguments the user just set... interp.runcommand("""if 1: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -740,6 +740,7 @@ Ty Sarna Ben Sayer sbt +Marco Scataglini Michael Scharf Neil Schemenauer David Scherer @@ -759,6 +760,7 @@ Žiga Seilnach Fred Sells Jiwon Seo +Roger Serwy Jerry Seutter Denis Severson Ian Seyer diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -90,6 +90,9 @@ Library ------- +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + - Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #13506 Add '' to path for interactive interpreter by adding with_cwd parameter
by terry.reedy 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/1993aa091d89 changeset: 74693:1993aa091d89 branch: 3.2 parent: 74690:c5a09a96f533 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Jan 31 02:26:32 2012 -0500 summary: #13506 Add '' to path for interactive interpreter by adding with_cwd parameter to PyShell.PyShell.transfer_path() and changing elsewhere as needed. Original patches by Marco Scataglini and Roger Serwy. files: Lib/idlelib/PyShell.py | 19 +++++++++++++------ Lib/idlelib/ScriptBinding.py | 5 ++--- Misc/ACKS | 3 ++- Misc/NEWS | 3 +++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -411,11 +411,11 @@ self.rpcclt.register("flist", self.tkconsole.flist) self.rpcclt.register("linecache", linecache) self.rpcclt.register("interp", self) - self.transfer_path() + self.transfer_path(with_cwd=True) self.poll_subprocess() return self.rpcclt - def restart_subprocess(self): + def restart_subprocess(self, with_cwd=False): if self.restarting: return self.rpcclt self.restarting = True @@ -439,7 +439,7 @@ except socket.timeout as err: self.display_no_subprocess_error() return None - self.transfer_path() + self.transfer_path(with_cwd=with_cwd) # annotate restart in shell window and mark it console.text.delete("iomark", "end-1c") if was_executing: @@ -488,12 +488,18 @@ except OSError: return - def transfer_path(self): + def transfer_path(self, with_cwd=False): + if with_cwd: # Issue 13506 + path = [''] # include Current Working Directory + path.extend(sys.path) + else: + path = sys.path + self.runcommand("""if 1: import sys as _sys _sys.path = %r del _sys - \n""" % (sys.path,)) + \n""" % (path,)) active_seq = None @@ -1187,7 +1193,8 @@ self.text.see("restart") def restart_shell(self, event=None): - self.interp.restart_subprocess() + "Callback for Run/Restart Shell Cntl-F6" + self.interp.restart_subprocess(with_cwd=True) def showprompt(self): self.resetoutput() diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -144,10 +144,9 @@ return 'break' if not self.tabnanny(filename): return 'break' - shell = self.shell - interp = shell.interp + interp = self.shell.interp if PyShell.use_subprocess: - shell.restart_shell() + interp.restart_subprocess(with_cwd=False) dirname = os.path.dirname(filename) # XXX Too often this discards arguments the user just set... interp.runcommand("""if 1: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -806,6 +806,7 @@ Ty Sarna Ben Sayer sbt +Marco Scataglini Andrew Schaaf Michael Scharf Andreas Schawo @@ -830,7 +831,7 @@ Yury Selivanov Fred Sells Jiwon Seo -Roger D. Serwy +Roger Serwy Jerry Seutter Denis Severson Ian Seyer diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -113,6 +113,9 @@ Library ------- +- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. + Original patches by Marco Scataglini and Roger Serwy. + - Issue #13848: open() and the FileIO constructor now check for NUL characters in the file name. Patch by Hynek Schlawack. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (2db416b953e8): sum=0
by solipsis＠pitrou.net 30 Jan '12

30 Jan '12

results for 2db416b953e8 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogJzCAwg', '-x']

1 0

cpython (merge 3.2 -> default): Fix zipimport.c's read_directory() to use appropriate types for the values
by gregory.p.smith 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/2db416b953e8 changeset: 74691:2db416b953e8 parent: 74689:80ddbd822227 parent: 74690:c5a09a96f533 user: Gregory P. Smith <greg(a)krypto.org> date: Mon Jan 30 15:55:29 2012 -0800 summary: Fix zipimport.c's read_directory() to use appropriate types for the values being read from the header vs the values being used by fseek and ftell (Py_ssize_t for those). Updates the Py_BuildValue format string to match (including several existing wrong 'i's that should have been 'l's). files: Modules/zipimport.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -728,14 +728,15 @@ PyObject *files = NULL; FILE *fp; unsigned short flags; - long compress, crc, data_size, file_size, file_offset, date, time; - long header_offset, name_size, header_size, header_position; + short compress, time, date, name_size; + long crc, data_size, file_size, header_size; + Py_ssize_t file_offset, header_position, header_offset; long l, count; Py_ssize_t i; char name[MAXPATHLEN + 5]; PyObject *nameobj = NULL; char *p, endof_central_dir[22]; - long arc_offset; /* offset from beginning of file to start of zip-archive */ + Py_ssize_t arc_offset; /* Absolute offset to start of the zip-archive. */ PyObject *path; const char *charset; int bootstrap; @@ -835,7 +836,7 @@ path = PyUnicode_FromFormat("%U%c%U", archive, SEP, nameobj); if (path == NULL) goto error; - t = Py_BuildValue("Niiiiiii", path, compress, data_size, + t = Py_BuildValue("Nhllnhhl", path, compress, data_size, file_size, file_offset, time, date, crc); if (t == NULL) goto error; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix zip_import.c's read_directory() to use appropriate types for the values
by gregory.p.smith 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/c5a09a96f533 changeset: 74690:c5a09a96f533 branch: 3.2 parent: 74685:e858bb04f7e7 user: Gregory P. Smith <greg(a)krypto.org> date: Mon Jan 30 15:17:33 2012 -0800 summary: Fix zip_import.c's read_directory() to use appropriate types for the values being read from the header vs the values being used by fseek and ftell (Py_ssize_t for those) and how they are computed. Py_ssize_t is used for actual file offsets so that files greater than 2gigs could be supported. Updates the Py_BuildValue format string to match (including several existing wrong 'i's that should have been 'l's). files: Modules/zipimport.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -714,15 +714,16 @@ PyObject *files = NULL; FILE *fp; unsigned short flags; - long compress, crc, data_size, file_size, file_offset, date, time; - long header_offset, name_size, header_size, header_position; + short compress, time, date, name_size; + long crc, data_size, file_size, header_size; + Py_ssize_t file_offset, header_position, header_offset; long i, l, count; size_t length; Py_UNICODE path[MAXPATHLEN + 5]; char name[MAXPATHLEN + 5]; PyObject *nameobj = NULL; char *p, endof_central_dir[22]; - long arc_offset; /* offset from beginning of file to start of zip-archive */ + Py_ssize_t arc_offset; /* Absolute offset to start of the zip-archive. */ PyObject *pathobj; const char *charset; int bootstrap; @@ -832,7 +833,7 @@ pathobj = PyUnicode_FromUnicode(path, Py_UNICODE_strlen(path)); if (pathobj == NULL) goto error; - t = Py_BuildValue("Niiiiiii", pathobj, compress, data_size, + t = Py_BuildValue("Nhllnhhl", pathobj, compress, data_size, file_size, file_offset, time, date, crc); if (t == NULL) goto error; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #8828: Add new function os.replace(), for cross-platform renaming with
by antoine.pitrou 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/80ddbd822227 changeset: 74689:80ddbd822227 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Jan 30 22:08:52 2012 +0100 summary: Issue #8828: Add new function os.replace(), for cross-platform renaming with overwriting. files: Doc/library/os.rst | 18 +++++++++- Lib/test/test_os.py | 12 ++++++ Misc/NEWS | 3 + Modules/posixmodule.c | 55 +++++++++++++++++++++--------- 4 files changed, 69 insertions(+), 19 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1889,8 +1889,9 @@ Unix flavors if *src* and *dst* are on different filesystems. If successful, the renaming will be an atomic operation (this is a POSIX requirement). On Windows, if *dst* already exists, :exc:`OSError` will be raised even if it is a - file; there may be no way to implement an atomic rename when *dst* names an - existing file. + file. + + If you want cross-platform overwriting of the destination, use :func:`replace`. Availability: Unix, Windows. @@ -1908,6 +1909,19 @@ permissions needed to remove the leaf directory or file. +.. function:: replace(src, dst) + + Rename the file or directory *src* to *dst*. If *dst* is a directory, + :exc:`OSError` will be raised. If *dst* exists and is a file, it will + be replaced silently if the user has permission. The operation may fail + if *src* and *dst* are on different filesystems. If successful, + the renaming will be an atomic operation (this is a POSIX requirement). + + Availability: Unix, Windows + + .. versionadded:: 3.3 + + .. function:: rmdir(path) Remove (delete) the directory *path*. Only works when the directory is 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 @@ -129,6 +129,18 @@ self.fdopen_helper('r') self.fdopen_helper('r', 100) + def test_replace(self): + TESTFN2 = support.TESTFN + ".2" + with open(support.TESTFN, 'w') as f: + f.write("1") + with open(TESTFN2, 'w') as f: + f.write("2") + self.addCleanup(os.unlink, TESTFN2) + os.replace(support.TESTFN, TESTFN2) + self.assertRaises(FileNotFoundError, os.stat, support.TESTFN) + with open(TESTFN2, 'r') as f: + self.assertEqual(f.read(), "1") + # Test attributes on return values from os.*stat* family. class StatAttributeTests(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -463,6 +463,9 @@ Library ------- +- Issue #8828: Add new function os.replace(), for cross-platform renaming + with overwriting. + - Issue #13848: open() and the FileIO constructor now check for NUL characters in the file name. Patch by Hynek Schlawack. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3280,17 +3280,16 @@ #endif /* HAVE_SETPRIORITY */ -PyDoc_STRVAR(posix_rename__doc__, -"rename(old, new)\n\n\ -Rename a file or directory."); - -static PyObject * -posix_rename(PyObject *self, PyObject *args) +static PyObject * +internal_rename(PyObject *self, PyObject *args, int is_replace) { #ifdef MS_WINDOWS PyObject *src, *dst; BOOL result; - if (PyArg_ParseTuple(args, "UU:rename", &src, &dst)) + int flags = is_replace ? MOVEFILE_REPLACE_EXISTING : 0; + if (PyArg_ParseTuple(args, + is_replace ? "UU:replace" : "UU:rename", + &src, &dst)) { wchar_t *wsrc, *wdst; @@ -3301,16 +3300,17 @@ if (wdst == NULL) return NULL; Py_BEGIN_ALLOW_THREADS - result = MoveFileW(wsrc, wdst); + result = MoveFileExW(wsrc, wdst, flags); Py_END_ALLOW_THREADS if (!result) - return win32_error("rename", NULL); + return win32_error(is_replace ? "replace" : "rename", NULL); Py_INCREF(Py_None); return Py_None; } else { PyErr_Clear(); - if (!PyArg_ParseTuple(args, "O&O&:rename", + if (!PyArg_ParseTuple(args, + is_replace ? "O&O&:replace" : "O&O&:rename", PyUnicode_FSConverter, &src, PyUnicode_FSConverter, &dst)) return NULL; @@ -3319,15 +3319,15 @@ goto error; Py_BEGIN_ALLOW_THREADS - result = MoveFileA(PyBytes_AS_STRING(src), - PyBytes_AS_STRING(dst)); + result = MoveFileExA(PyBytes_AS_STRING(src), + PyBytes_AS_STRING(dst), flags); Py_END_ALLOW_THREADS Py_XDECREF(src); Py_XDECREF(dst); if (!result) - return win32_error("rename", NULL); + return win32_error(is_replace ? "replace" : "rename", NULL); Py_INCREF(Py_None); return Py_None; @@ -3337,10 +3337,30 @@ return NULL; } #else - return posix_2str(args, "O&O&:rename", rename); -#endif -} - + return posix_2str(args, + is_replace ? "O&O&:replace" : "O&O&:rename", rename); +#endif +} + +PyDoc_STRVAR(posix_rename__doc__, +"rename(old, new)\n\n\ +Rename a file or directory."); + +static PyObject * +posix_rename(PyObject *self, PyObject *args) +{ + return internal_rename(self, args, 0); +} + +PyDoc_STRVAR(posix_replace__doc__, +"replace(old, new)\n\n\ +Rename a file or directory, overwriting the destination."); + +static PyObject * +posix_replace(PyObject *self, PyObject *args) +{ + return internal_rename(self, args, 1); +} PyDoc_STRVAR(posix_rmdir__doc__, "rmdir(path)\n\n\ @@ -10555,6 +10575,7 @@ {"readlink", win_readlink, METH_VARARGS, win_readlink__doc__}, #endif /* !defined(HAVE_READLINK) && defined(MS_WINDOWS) */ {"rename", posix_rename, METH_VARARGS, posix_rename__doc__}, + {"replace", posix_replace, METH_VARARGS, posix_replace__doc__}, {"rmdir", posix_rmdir, METH_VARARGS, posix_rmdir__doc__}, {"stat", posix_stat, METH_VARARGS, posix_stat__doc__}, {"stat_float_times", stat_float_times, METH_VARARGS, stat_float_times__doc__}, -- Repository URL: http://hg.python.org/cpython

2 1

cpython: Issue #13890: Also fix for extension module tests for case-insensitivity.
by brett.cannon 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/2914ce82bf89 changeset: 74688:2914ce82bf89 user: Brett Cannon <brett(a)python.org> date: Mon Jan 30 12:51:49 2012 -0500 summary: Issue #13890: Also fix for extension module tests for case-insensitivity. files: Lib/importlib/test/extension/test_case_sensitivity.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Lib/importlib/test/extension/test_case_sensitivity.py b/Lib/importlib/test/extension/test_case_sensitivity.py --- a/Lib/importlib/test/extension/test_case_sensitivity.py +++ b/Lib/importlib/test/extension/test_case_sensitivity.py @@ -20,12 +20,18 @@ def test_case_sensitive(self): with support.EnvironmentVarGuard() as env: env.unset('PYTHONCASEOK') + if b'PYTHONCASEOK' in _bootstrap._os.environ: + self.skipTest('os.environ changes not reflected in ' + '_os.environ') loader = self.find_module() self.assertIsNone(loader) def test_case_insensitivity(self): with support.EnvironmentVarGuard() as env: env.set('PYTHONCASEOK', '1') + if b'PYTHONCASEOK' not in _bootstrap._os.environ: + self.skipTest('os.environ changes not reflected in ' + '_os.environ') loader = self.find_module() self.assertTrue(hasattr(loader, 'load_module')) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #13890: Fix importlib case-sensitivity tests to not run on Windows.
by brett.cannon 30 Jan '12

30 Jan '12

http://hg.python.org/cpython/rev/54d7823ec488 changeset: 74687:54d7823ec488 user: Brett Cannon <brett(a)python.org> date: Mon Jan 30 12:48:16 2012 -0500 summary: Issue #13890: Fix importlib case-sensitivity tests to not run on Windows. Thanks to os.environ under Windows only updating the dict and not the environment itself (as exposed by nt.environ), tests using PYTHONCASEOK always fail. Now the tests are skipped when os.environ does not do what is expected. files: Lib/importlib/test/source/test_case_sensitivity.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Lib/importlib/test/source/test_case_sensitivity.py b/Lib/importlib/test/source/test_case_sensitivity.py --- a/Lib/importlib/test/source/test_case_sensitivity.py +++ b/Lib/importlib/test/source/test_case_sensitivity.py @@ -37,6 +37,9 @@ def test_sensitive(self): with test_support.EnvironmentVarGuard() as env: env.unset('PYTHONCASEOK') + if b'PYTHONCASEOK' in _bootstrap._os.environ: + self.skipTest('os.environ changes not reflected in ' + '_os.environ') sensitive, insensitive = self.sensitivity_test() self.assertTrue(hasattr(sensitive, 'load_module')) self.assertIn(self.name, sensitive.get_filename(self.name)) @@ -45,6 +48,9 @@ def test_insensitive(self): with test_support.EnvironmentVarGuard() as env: env.set('PYTHONCASEOK', '1') + if b'PYTHONCASEOK' not in _bootstrap._os.environ: + self.skipTest('os.environ changes not reflected in ' + '_os.environ') sensitive, insensitive = self.sensitivity_test() self.assertTrue(hasattr(sensitive, 'load_module')) self.assertIn(self.name, sensitive.get_filename(self.name)) -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (53b8f55e08bd): sum=0
by solipsis＠pitrou.net 29 Jan '12

29 Jan '12

results for 53b8f55e08bd on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogxBn2kZ', '-x']

1 0

cpython (merge 3.2 -> default): merge 3.2 (closes #13908)
by benjamin.peterson 29 Jan '12

29 Jan '12

http://hg.python.org/cpython/rev/53b8f55e08bd changeset: 74686:53b8f55e08bd parent: 74683:5b42aefb8969 parent: 74685:e858bb04f7e7 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Jan 29 20:17:07 2012 -0500 summary: merge 3.2 (closes #13908) files: Misc/NEWS | 2 ++ Objects/typeobject.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #13908: Ready types returned from PyType_FromSpec. + - Issue #11235: Fix OverflowError when trying to import a source file whose modification time doesn't fit in a 32-bit timestamp. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2394,7 +2394,8 @@ #include "typeslots.inc" }; -PyObject* PyType_FromSpec(PyType_Spec *spec) +PyObject * +PyType_FromSpec(PyType_Spec *spec) { PyHeapTypeObject *res = (PyHeapTypeObject*)PyType_GenericAlloc(&PyType_Type, 0); char *res_start = (char*)res; @@ -2434,6 +2435,9 @@ } } + if (PyType_Ready(&res->ht_type) < 0) + goto fail; + return (PyObject*)res; fail: -- Repository URL: http://hg.python.org/cpython

1 0