Mailman 3 July 2013 - Python-Dev

PEP 446: cloexec flag on os.open
by Ronald Oussoren July 29, 2013

July 29, 2013

Victor, PEP 446 mentions that a cloexec flag gets added to os.open. This API already has a way to specify this: the O_CLOEXEC bit in the flags argument. A new cloexec parameter is nicely consistent with the other APIs, but introcudes a second way to set that flag. What will the following calls do?: os.open(path, os.O_RDONLY|os.O_CLOEXEC, cloexec=False) os.open(path, os.O_RDONLY, cloexec=True) The PEP doesn't specify this, but the implementation for PEP 443 in issue 17036 basicly ignores the cloexec argument in the first call and adds O_CLOEXEC in the second call. That can lead to confusing behavior when the flags argument to os.open is passed from elsewhere (e.g. a wrapper around os.open that passes in arguments and just overrides the cloexec argument). It might be better to just drop the cloexec flag to os.open and make os.O_CLOEXEC an alias for os.O_NOINHERIT on Windows. Ronald

1 0

Refactoring test.support into a subpackage
by Nick Coghlan July 28, 2013

July 28, 2013

At the PyCon AU sprints, some of the sprinters worked on a plan Chris Jerdonek and I came up with months ago to convert test.support from a module into a subpackage. This plan arose from some nasty test suite hacks in the lead up to the release of Python 3.3, where some of the pkgutil tests ended up in test.test_runpy so they could use the package creation infrastructure I have in there without needing to extract a helper module with a release imminent. The scope of the plan covers a few distinct steps: 1. Move Lib/test/support.py to Lib/test/support/__init__.py (http://bugs.python.org/issue15494) 2. Add a new (documented) test.support.pkg_helper submodule with the package creation support code (http://bugs.python.org/issue15403 and http://bugs.python.org/issue15376) 3. Move the pkgutil tests to test.test_pkgutil where they belong (http://bugs.python.org/issue15358) 4. Move the existing test.script_helper and test.bytecode_helper support modules into the test.support subpackage and document them (no issue for that as yet) These changes would be made on both 3.3 and default, to avoid future merge conflicts (note that Indra also posted an updated patch for one pending test suite update to cope with the relocation: http://bugs.python.org/issue15415) My main motivation for doing this is to give a bit more visibility to the helpers that already exist, as well as making them easier to find when we want to look into the details of what a test is doing. At the moment, they tend to get lost in the sea of actual test files in the main test directory. (Chris and I initially held off on this while waiting for the final 3.2 release, and then that got delayed and it wasn't until Indra, Michael and Stephen started looking into it at the sprints that I started paying attention again) Cheers, Nick. -- Nick Coghlan | ncoghlan(a)gmail.com | Brisbane, Australia

2 3

Coverity Scan
by Christian Heimes July 26, 2013

July 26, 2013

Hello, this is an update on my work and the current status of Coverity Scan. Maybe you have noticed a checkins made be me that end with the line "CID #". These are checkins that fix an issue that was discovered by the static code analyzer Coverity. Coverity is a commercial product but it's a free service for some Open Source projects. Python has been analyzed by Coverity since about 2007. Guido, Neal, Brett, Stefan and some other developers have used Coverity before I took over. I fixed a couple of issues before 3.3 reached the RC phase and more bugs in the last couple of months. Coverity is really great and its web GUI is fun to use, too. I was able to identify and fix resource leaks, NULL pointer issues, buffer overflows and missing checks all over the place. Because it's a static analyzer that follows data-flows and control-flows the tool can detect issues in error paths that are hardly visited at all. I have started to document Coverity here: http://docs.python.org/devguide/coverity.html Interview --------- A week ago I was contacted by Coverity. They have started a series of articles and press releases about Open Source projects that use their free service Coverity Scan, see http://www.coverity.com/company/press-releases/read/coverity-introduces-mon… Two days ago I had a lovely phone interview about my involvement in the Python project and our development style. They are going to release a nice article in a couple of weeks. In the mean time we have time to fix the remaining couple issues. We *might* be able to reach the highest coverity integrity level! I have dealt with all major issues so we just have to fix a couple of issues. Current stats ------------- Lines of Code: 396,179 Defect Density: 0.05 Total defects: 1,054 Outstanding: 21 (Coverity Connect shows less) Dismissed: 222 Fixed: 811 http://i.imgur.com/NoELjcj.jpg http://i.imgur.com/eJSzTUX.jpg open issues ----------- http://bugs.python.org/issue17899 http://bugs.python.org/issue18556 http://bugs.python.org/issue18555 http://bugs.python.org/issue18552 http://bugs.python.org/issue18551 http://bugs.python.org/issue18550 http://bugs.python.org/issue18528 Christian

5 14

Summary of Python tracker Issues
by Python tracker July 26, 2013

July 26, 2013

ACTIVITY SUMMARY (2013-07-19 - 2013-07-26) Python tracker at http://bugs.python.org/ To view or respond to any of the issues listed below, click on the issue. Do NOT respond to this message. Issues counts and deltas: open 4114 (+22) closed 26220 (+35) total 30334 (+57) Open issues with patches: 1856 Issues opened (37) ================== #18505: Duplicate function names in test_email.py http://bugs.python.org/issue18505 opened by vajrasky #18507: import_init() should not use Py_FatalError() but return an err http://bugs.python.org/issue18507 opened by haypo #18509: CJK decoders should return MBERR_EXCEPTION on PyUnicodeWriter http://bugs.python.org/issue18509 opened by haypo #18512: sys.stdout.write does not allow bytes in Python 3.x http://bugs.python.org/issue18512 opened by ntrrgc #18515: zipfile._ZipDecryptor generates wasteful crc32 table on import http://bugs.python.org/issue18515 opened by dholth #18516: Typos in Lib/email/generator.py and Lib/email/architecture.rst http://bugs.python.org/issue18516 opened by vajrasky #18517: "xxlimited" extension declared incorrectly in setup.py http://bugs.python.org/issue18517 opened by ned.deily #18518: return-ing within code timed with timeit.timeit causes wrong r http://bugs.python.org/issue18518 opened by icedream91 #18519: test_sqlite crashes on OS X tiger 3.x buildbot http://bugs.python.org/issue18519 opened by ned.deily #18521: [cppcheck] Full report http://bugs.python.org/issue18521 opened by serval2412 #18526: Add resource management/guarding to unittest http://bugs.python.org/issue18526 opened by zach.ware #18527: Upgrade Modules/zlib to 1.2.8 http://bugs.python.org/issue18527 opened by christian.heimes #18528: Possible fd leak in socketmodule http://bugs.python.org/issue18528 opened by christian.heimes #18529: Use long dash http://bugs.python.org/issue18529 opened by serhiy.storchaka #18530: posixpath.ismount performs extra lstat calls http://bugs.python.org/issue18530 opened by alex #18531: Undocumented different between METH_KEYWORDS and **kws http://bugs.python.org/issue18531 opened by barry #18532: hashlib.HASH objects should officially expose the hash name http://bugs.python.org/issue18532 opened by jason.coombs #18533: Avoid error from repr() of recursive dictview http://bugs.python.org/issue18533 opened by bennorth #18534: State clearly that open() 'file' param is "name" attr of the r http://bugs.python.org/issue18534 opened by ncoghlan #18535: termios.tcgetattr should return namedtuple http://bugs.python.org/issue18535 opened by techtonik #18538: `python -m dis ` relying on argparse http://bugs.python.org/issue18538 opened by maker #18539: Arguments tooltip wrong if def contains fractional default val http://bugs.python.org/issue18539 opened by ariel_bruner #18540: imaplib.IMAP4() ends with "Name or service not known" on Fedor http://bugs.python.org/issue18540 opened by sYnfo #18543: urllib.parse.urlopen shouldn't ignore installed opener when ca http://bugs.python.org/issue18543 opened by moritzs #18544: subprocess.Popen support for redirection of arbitrary file des http://bugs.python.org/issue18544 opened by ropoctorix #18546: ssl.get_server_certificate like addition for cert chain http://bugs.python.org/issue18546 opened by underrun #18548: In unittest doc change WidgetTestCase to SimpleWidgetTestCase http://bugs.python.org/issue18548 opened by py.user #18550: internal_setblocking() doesn't check return value of fcntl() http://bugs.python.org/issue18550 opened by christian.heimes #18551: child_exec() doesn't check return value of fcntl() http://bugs.python.org/issue18551 opened by christian.heimes #18552: obj2ast_object() doesn't check return value of PyArena_AddPyOb http://bugs.python.org/issue18552 opened by christian.heimes #18553: os.isatty() is not Unix only http://bugs.python.org/issue18553 opened by techtonik #18554: os.__all__ is incomplete http://bugs.python.org/issue18554 opened by ronaldoussoren #18555: type_set_bases() doesn't check return value of PyArg_UnpackTu http://bugs.python.org/issue18555 opened by christian.heimes #18558: Iterable glossary entry needs clarification http://bugs.python.org/issue18558 opened by Zero #18559: _pickle: NULL ptr dereference when PyLong_FromSsize_t() fails http://bugs.python.org/issue18559 opened by christian.heimes #18560: builtin_sum() doesn't check return value of PyLong_FromLong() http://bugs.python.org/issue18560 opened by christian.heimes #18561: ctypes _build_callargs() doesn't check name for NULL http://bugs.python.org/issue18561 opened by christian.heimes Most recent 15 issues with no replies (15) ========================================== #18561: ctypes _build_callargs() doesn't check name for NULL http://bugs.python.org/issue18561 #18560: builtin_sum() doesn't check return value of PyLong_FromLong() http://bugs.python.org/issue18560 #18559: _pickle: NULL ptr dereference when PyLong_FromSsize_t() fails http://bugs.python.org/issue18559 #18554: os.__all__ is incomplete http://bugs.python.org/issue18554 #18553: os.isatty() is not Unix only http://bugs.python.org/issue18553 #18552: obj2ast_object() doesn't check return value of PyArena_AddPyOb http://bugs.python.org/issue18552 #18551: child_exec() doesn't check return value of fcntl() http://bugs.python.org/issue18551 #18550: internal_setblocking() doesn't check return value of fcntl() http://bugs.python.org/issue18550 #18548: In unittest doc change WidgetTestCase to SimpleWidgetTestCase http://bugs.python.org/issue18548 #18544: subprocess.Popen support for redirection of arbitrary file des http://bugs.python.org/issue18544 #18543: urllib.parse.urlopen shouldn't ignore installed opener when ca http://bugs.python.org/issue18543 #18539: Arguments tooltip wrong if def contains fractional default val http://bugs.python.org/issue18539 #18527: Upgrade Modules/zlib to 1.2.8 http://bugs.python.org/issue18527 #18509: CJK decoders should return MBERR_EXCEPTION on PyUnicodeWriter http://bugs.python.org/issue18509 #18507: import_init() should not use Py_FatalError() but return an err http://bugs.python.org/issue18507 Most recent 15 issues waiting for review (15) ============================================= #18560: builtin_sum() doesn't check return value of PyLong_FromLong() http://bugs.python.org/issue18560 #18559: _pickle: NULL ptr dereference when PyLong_FromSsize_t() fails http://bugs.python.org/issue18559 #18554: os.__all__ is incomplete http://bugs.python.org/issue18554 #18552: obj2ast_object() doesn't check return value of PyArena_AddPyOb http://bugs.python.org/issue18552 #18548: In unittest doc change WidgetTestCase to SimpleWidgetTestCase http://bugs.python.org/issue18548 #18540: imaplib.IMAP4() ends with "Name or service not known" on Fedor http://bugs.python.org/issue18540 #18538: `python -m dis ` relying on argparse http://bugs.python.org/issue18538 #18533: Avoid error from repr() of recursive dictview http://bugs.python.org/issue18533 #18530: posixpath.ismount performs extra lstat calls http://bugs.python.org/issue18530 #18529: Use long dash http://bugs.python.org/issue18529 #18528: Possible fd leak in socketmodule http://bugs.python.org/issue18528 #18526: Add resource management/guarding to unittest http://bugs.python.org/issue18526 #18519: test_sqlite crashes on OS X tiger 3.x buildbot http://bugs.python.org/issue18519 #18517: "xxlimited" extension declared incorrectly in setup.py http://bugs.python.org/issue18517 #18515: zipfile._ZipDecryptor generates wasteful crc32 table on import http://bugs.python.org/issue18515 Top 10 most discussed issues (10) ================================= #15805: Add stdout redirection tool to contextlib http://bugs.python.org/issue15805 24 msgs #17899: os.listdir() leaks FDs if invoked on FD pointing to a non-dire http://bugs.python.org/issue17899 13 msgs #18535: termios.tcgetattr should return namedtuple http://bugs.python.org/issue18535 8 msgs #18519: test_sqlite crashes on OS X tiger 3.x buildbot http://bugs.python.org/issue18519 7 msgs #18530: posixpath.ismount performs extra lstat calls http://bugs.python.org/issue18530 7 msgs #18441: Idle: Make test.support.requires('gui') skip when it should. http://bugs.python.org/issue18441 6 msgs #18533: Avoid error from repr() of recursive dictview http://bugs.python.org/issue18533 6 msgs #18078: threading.Condition to allow notify on a specific waiter http://bugs.python.org/issue18078 5 msgs #18324: set_payload does not handle binary payloads correctly http://bugs.python.org/issue18324 5 msgs #18408: Fixes crashes found by pyfailmalloc http://bugs.python.org/issue18408 5 msgs Issues closed (34) ================== #8079: make install fails with -j8 with python2.6/config on FreeBSD http://bugs.python.org/issue8079 closed by christian.heimes #9177: ssl.read/write on closed socket raises AttributeError http://bugs.python.org/issue9177 closed by pitrou #14853: test_file.py depends on sys.stdin being unseekable http://bugs.python.org/issue14853 closed by ezio.melotti #15130: remove redundant paragraph in socket howto http://bugs.python.org/issue15130 closed by r.david.murray #15905: Copy to fixed size buffer w/o check in sys_update_path http://bugs.python.org/issue15905 closed by christian.heimes #16937: -u (unbuffered I/O) command line option documentation mismatch http://bugs.python.org/issue16937 closed by ezio.melotti #17818: aifc.Aifc_read/Aifc_write.getparams can return a namedtuple http://bugs.python.org/issue17818 closed by r.david.murray #17944: Refactor test_zipfile http://bugs.python.org/issue17944 closed by serhiy.storchaka #18327: swapped arguments in compatible_for_assignment()? http://bugs.python.org/issue18327 closed by christian.heimes #18439: Patchcheck for ACKS, NEWS does not work on Windows. http://bugs.python.org/issue18439 closed by terry.reedy #18460: .chm documentation files advertised in download.html but not t http://bugs.python.org/issue18460 closed by loewis #18488: sqlite: finalize() method of user function may be called with http://bugs.python.org/issue18488 closed by haypo #18491: Add "exe wrapper" functionality to Windows launcher http://bugs.python.org/issue18491 closed by python-dev #18503: No assertion in test_del_param_on_nonexistent_header function http://bugs.python.org/issue18503 closed by r.david.murray #18506: DISABLEd Tkinter.Listbox still fires <<ListboxSelect>> for mou http://bugs.python.org/issue18506 closed by ned.deily #18508: enum.Enum population of _value2member_map does not match fallb http://bugs.python.org/issue18508 closed by python-dev #18510: dict.__contains__ and dict.keys().__contains__ raises exceptio http://bugs.python.org/issue18510 closed by ronaldoussoren #18511: random.shuffle could be faster http://bugs.python.org/issue18511 closed by rhettinger #18513: test.cmath fails on OS/X with gcc-4.8 in non-debug build http://bugs.python.org/issue18513 closed by mark.dickinson #18514: Unreachable Py_DECREF() in ctypes's PyCData_FromBaseObj() http://bugs.python.org/issue18514 closed by christian.heimes #18520: Fixes bugs found by pyfailmalloc during Python initialization http://bugs.python.org/issue18520 closed by haypo #18522: Error creating a raw string of r'\\?\' http://bugs.python.org/issue18522 closed by pitrou #18523: test_signal failure under Windows http://bugs.python.org/issue18523 closed by haypo #18524: BufferedReader.read1() documentation/implementation difference http://bugs.python.org/issue18524 closed by pitrou #18525: Shutil cannot import WindowsError on windows http://bugs.python.org/issue18525 closed by ronaldoussoren #18536: 李浩在 Google+ 上分享了一条信息 http://bugs.python.org/issue18536 closed by pitrou #18537: bool.toggle() http://bugs.python.org/issue18537 closed by eric.smith #18541: LoggerAdapter example is counter-productive http://bugs.python.org/issue18541 closed by python-dev #18542: httpd memory consuption increasing continously due to mod_pyth http://bugs.python.org/issue18542 closed by ronaldoussoren #18545: enum always runs member_type when use_args is True http://bugs.python.org/issue18545 closed by python-dev #18547: os.path.dirname() does not behave as expected for path without http://bugs.python.org/issue18547 closed by r.david.murray #18549: Dead code in socket_ntohl() http://bugs.python.org/issue18549 closed by christian.heimes #18556: ctypes' U_set() doesn't check return value of PyUnicode_AsWide http://bugs.python.org/issue18556 closed by brett.cannon #18557: email address parser desired http://bugs.python.org/issue18557 closed by r.david.murray

1 0

Python 3 as a Default in Linux Distros
by Bohuslav Kabrda July 25, 2013

July 25, 2013

Hi all, in recent days, there has been a discussion on fedora-devel (see thread [1]) about moving to Python 3 as a default. I'd really love to hear opinions on the matter from the upstream, mainly regarding these two points (that are not that clearly defined in my original proposal and have been formed during the discussion): - Should we point /usr/bin/python to Python 3 when we make the move? I know that pep 394 [2] deals with this and it says that /usr/bin/python may refer to Python 3 on some bleeding edge distributions - supposedly, this was added to the pep because of what Arch Linux did, not the other way round. As the pep says, the recommendation of pointing /usr/bin/python to Python 2 may be changed after the Python 3 ecosystem is sufficiently mature. I'm wondering if there are any more specific criteria - list of big projects migrated/ported or something like that - or will this be judged by what I'd call "overall spirit" in Python community (I hope you know what I mean by this)? In Fedora, we have two concerns that clash in this decision - being "First" (e.g. actively promote and use new technologies and also suggest them to our users) vs. not breaking user expectations. So we figured it'd be a good idea to ask upstream to get more opinions on this. - What should user get after using "yum install python"? There are basically few ways of coping with this: 1) Just keep doing what we do, eventually far in the future drop "python" package and never provide it again (= go on only with python3/python4/... while having "yum install python" do nothing). 2) Do what is in 1), but when "python" is dropped, use virtual provide (*) "python" for python3 package, so that "yum install python" installs python3. 3), 4) Rename python to python2 and {don't add, add} virtual provide "python" in the same way that is in 1), 2) 5) Rename python to python2 and python3 to python at one point. This makes sense to me from the traditional "one version in distro + possibly compat package shipping the old" approach in Linux, but some say that Python 2 and Python 3 are just different languages [3] and this should never be done. All of the approaches have their pros and cons, but generally it is all about what user should get when he tries to install python - either nothing or python2 for now and python3 in future - and how we as a distro cope with that on the technical side (and when we should actually do the switch). Just as a sidenote, IMO the package that gets installed as "python" (if any) should point to /usr/bin/python, which makes consider these two points very closely coupled. Thank you all for your suggestions and opinions. Slavek. -- Regards, Bohuslav "Slavek" Kabrda. (*) You can think of a virtual provide as of a "packaging symlink" - adding "Provides: foo" to package makes "yum install foo" install this package, even if this package name is "bar". [1] https://lists.fedoraproject.org/pipermail/devel/2013-July/186098.html [2] http://www.python.org/dev/peps/pep-0394/ [3] https://lists.fedoraproject.org/pipermail/devel/2013-July/186186.html

18 39

Re: [Python-Dev] cpython (3.3): return NULL here
by Christian Heimes July 24, 2013

July 24, 2013

Am 23.07.2013 07:08, schrieb benjamin.peterson: > http://hg.python.org/cpython/rev/042ff9325c5e > changeset: 84804:042ff9325c5e > branch: 3.3 > parent: 84789:bb63f813a00f > user: Benjamin Peterson <benjamin(a)python.org> > date: Mon Jul 22 22:08:09 2013 -0700 > summary: > return NULL here > > files: > Python/dynload_shlib.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > > diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c > --- a/Python/dynload_shlib.c > +++ b/Python/dynload_shlib.c > @@ -91,7 +91,8 @@ > int i; > struct stat statb; > if (fstat(fileno(fp), &statb) == -1) { > - return PyErr_SetFromErrno(PyExc_IOError); > + PyErr_SetFromErrno(PyExc_IOError); > + return NULL; > } PyErr_SetFromErrno() already and always returns NULL. Or do you prefer to return NULL explicitly? Christian

5 6

Re: [Python-Dev] cpython: Add modeling file for Coverity Scan.
by Antoine Pitrou July 23, 2013

July 23, 2013

On Tue, 23 Jul 2013 01:31:24 +0200 (CEST) christian.heimes <python-checkins(a)python.org> wrote: > + > +typedef int sdigit; > +typedef long Py_ssize_t; Can't you write "typedef ssize_t Py_ssize_t" instead? Regards Antoine.

2 1

tuple index out of range
by Nicholas Hart July 23, 2013

July 23, 2013

Hi, I am new to this list and to troubleshooting python. I hope someone can help me. I am getting this tuple index out of range error while running a test call to my python code. Not sure what this error really means and was hoping someone might shed some light on how to fix this. Also was wondering why much of my .py files are not getting compiled to .pyc upon first run.. is this unusual or need I not worry? Running python 2.5.2 on fedora. Thanks, Nick

2 1

Re: [Python-Dev] cpython: Issue #18520: Add a new PyStructSequence_InitType2() function, same than
by Antoine Pitrou July 23, 2013

July 23, 2013

On Tue, 23 Jul 2013 08:22:30 +0200 Antoine Pitrou <solipsis(a)pitrou.net> wrote: > On Tue, 23 Jul 2013 08:15:29 +0200 > Ronald Oussoren <ronaldoussoren(a)mac.com> wrote: > > > > On 23 Jul, 2013, at 2:01, Benjamin Peterson <benjamin(a)python.org> wrote: > > > > > We've cheerfully broken the ABI before on minor releases, though if > > > it's part of the stable ABI, we can't be cavaliar about that anymore. > > > > It is not part of the stable ABI. Given that the implementation of > > PyStructSequence_InitType() in the patch just calls PyStructSequence_InitType2() > > and ignores the return value you could change the return value of ..InitType(). > > > > This may or may not break existing extensions using the function (depending on > > platform ABI details, AFAIK this is not a problem on x86/x86_64), but reusing > > extensions across python feature releases is not supported anyway. > > Not supported? It should certainly be supported accross bugfix > versions. Otherwise, installing a new bugfix version would force you to > recompile all independently-installed extension modules. Ah, but I see that "minor release" was used in the sense of "feature release". My bad. (Grrr!) Regards Antoine.

1 0

Re: [Python-Dev] [Python-checkins] cpython: Issue #18520: Add a new PyStructSequence_InitType2() function, same than
by Victor Stinner July 23, 2013

July 23, 2013

"Add a new PyStructSequence_InitType2()" I added a new function because I guess that it would break the API (and ABI) to change the return type of a function in a minor release. Tell me if you have a better name than PyStructSequence_InitType2() ;-) "Ex" suffix is usually used when parameters are added. It is not the case here. Victor Le 22 juil. 2013 23:59, "victor.stinner" <python-checkins(a)python.org> a écrit : > http://hg.python.org/cpython/rev/fc718c177ee6 > changeset: 84793:fc718c177ee6 > user: Victor Stinner <victor.stinner(a)gmail.com> > date: Mon Jul 22 22:24:54 2013 +0200 > summary: > Issue #18520: Add a new PyStructSequence_InitType2() function, same than > PyStructSequence_InitType() except that it has a return value (0 on > success, > -1 on error). > > * PyStructSequence_InitType2() now raises MemoryError on memory > allocation failure > * Fix also some calls to PyDict_SetItemString(): handle error > > files: > Include/pythonrun.h | 2 +- > Include/structseq.h | 2 + > Misc/NEWS | 4 +++ > Modules/_lsprof.c | 10 ++++--- > Modules/grpmodule.c | 11 ++++++-- > Modules/posixmodule.c | 24 ++++++++++++------ > Modules/pwdmodule.c | 5 ++- > Modules/resource.c | 9 ++++-- > Modules/signalmodule.c | 7 +++-- > Modules/spwdmodule.c | 8 ++++-- > Modules/timemodule.c | 5 ++- > Objects/floatobject.c | 9 ++++-- > Objects/longobject.c | 6 +++- > Objects/structseq.c | 37 +++++++++++++++++++++-------- > Python/pythonrun.c | 3 +- > Python/sysmodule.c | 23 ++++++++++++----- > Python/thread.c | 6 +++- > 17 files changed, 117 insertions(+), 54 deletions(-) > > > diff --git a/Include/pythonrun.h b/Include/pythonrun.h > --- a/Include/pythonrun.h > +++ b/Include/pythonrun.h > @@ -197,7 +197,7 @@ > PyAPI_FUNC(void) _PyExc_Init(PyObject * bltinmod); > PyAPI_FUNC(void) _PyImportHooks_Init(void); > PyAPI_FUNC(int) _PyFrame_Init(void); > -PyAPI_FUNC(void) _PyFloat_Init(void); > +PyAPI_FUNC(int) _PyFloat_Init(void); > PyAPI_FUNC(int) PyByteArray_Init(void); > PyAPI_FUNC(void) _PyRandom_Init(void); > #endif > diff --git a/Include/structseq.h b/Include/structseq.h > --- a/Include/structseq.h > +++ b/Include/structseq.h > @@ -24,6 +24,8 @@ > #ifndef Py_LIMITED_API > PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type, > PyStructSequence_Desc *desc); > +PyAPI_FUNC(int) PyStructSequence_InitType2(PyTypeObject *type, > + PyStructSequence_Desc *desc); > #endif > PyAPI_FUNC(PyTypeObject*) PyStructSequence_NewType(PyStructSequence_Desc > *desc); > > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -10,6 +10,10 @@ > Core and Builtins > ----------------- > > +- Issue #18520: Add a new PyStructSequence_InitType2() function, same than > + PyStructSequence_InitType() except that it has a return value (0 on > success, > + -1 on error). > + > - Issue #15905: Fix theoretical buffer overflow in handling of > sys.argv[0], > prefix and exec_prefix if the operation system does not obey MAXPATHLEN. > > diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c > --- a/Modules/_lsprof.c > +++ b/Modules/_lsprof.c > @@ -884,10 +884,12 @@ > PyDict_SetItemString(d, "Profiler", (PyObject *)&PyProfiler_Type); > > if (!initialized) { > - PyStructSequence_InitType(&StatsEntryType, > - &profiler_entry_desc); > - PyStructSequence_InitType(&StatsSubEntryType, > - &profiler_subentry_desc); > + if (PyStructSequence_InitType2(&StatsEntryType, > + &profiler_entry_desc) < 0) > + return NULL; > + if (PyStructSequence_InitType2(&StatsSubEntryType, > + &profiler_subentry_desc) < 0) > + return NULL; > } > Py_INCREF((PyObject*) &StatsEntryType); > Py_INCREF((PyObject*) &StatsSubEntryType); > diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c > --- a/Modules/grpmodule.c > +++ b/Modules/grpmodule.c > @@ -210,9 +210,14 @@ > if (m == NULL) > return NULL; > d = PyModule_GetDict(m); > - if (!initialized) > - PyStructSequence_InitType(&StructGrpType, > &struct_group_type_desc); > - PyDict_SetItemString(d, "struct_group", (PyObject *) &StructGrpType); > + if (!initialized) { > + if (PyStructSequence_InitType2(&StructGrpType, > + &struct_group_type_desc) < 0) > + return NULL; > + } > + if (PyDict_SetItemString(d, "struct_group", > + (PyObject *)&StructGrpType) < 0) > + return NULL; > initialized = 1; > return m; > } > diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c > --- a/Modules/posixmodule.c > +++ b/Modules/posixmodule.c > @@ -11518,19 +11518,23 @@ > if (!initialized) { > #if defined(HAVE_WAITID) && !defined(__APPLE__) > waitid_result_desc.name = MODNAME ".waitid_result"; > - PyStructSequence_InitType(&WaitidResultType, &waitid_result_desc); > + if (PyStructSequence_InitType2(&WaitidResultType, > &waitid_result_desc) < 0) > + return NULL; > #endif > > stat_result_desc.name = MODNAME ".stat_result"; > stat_result_desc.fields[7].name = PyStructSequence_UnnamedField; > stat_result_desc.fields[8].name = PyStructSequence_UnnamedField; > stat_result_desc.fields[9].name = PyStructSequence_UnnamedField; > - PyStructSequence_InitType(&StatResultType, &stat_result_desc); > + if (PyStructSequence_InitType2(&StatResultType, > &stat_result_desc) < 0) > + return NULL; > structseq_new = StatResultType.tp_new; > StatResultType.tp_new = statresult_new; > > statvfs_result_desc.name = MODNAME ".statvfs_result"; > - PyStructSequence_InitType(&StatVFSResultType, > &statvfs_result_desc); > + if (PyStructSequence_InitType2(&StatVFSResultType, > + &statvfs_result_desc) < 0) > + return NULL; > #ifdef NEED_TICKS_PER_SECOND > # if defined(HAVE_SYSCONF) && defined(_SC_CLK_TCK) > ticks_per_second = sysconf(_SC_CLK_TCK); > @@ -11543,12 +11547,15 @@ > > #if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) > sched_param_desc.name = MODNAME ".sched_param"; > - PyStructSequence_InitType(&SchedParamType, &sched_param_desc); > + if (PyStructSequence_InitType2(&SchedParamType, > &sched_param_desc) < 0) > + return NULL; > SchedParamType.tp_new = sched_param_new; > #endif > > /* initialize TerminalSize_info */ > - PyStructSequence_InitType(&TerminalSizeType, &TerminalSize_desc); > + if (PyStructSequence_InitType2(&TerminalSizeType, > + &TerminalSize_desc) < 0) > + return NULL; > } > #if defined(HAVE_WAITID) && !defined(__APPLE__) > Py_INCREF((PyObject*) &WaitidResultType); > @@ -11566,11 +11573,13 @@ > #endif > > times_result_desc.name = MODNAME ".times_result"; > - PyStructSequence_InitType(&TimesResultType, &times_result_desc); > + if (PyStructSequence_InitType2(&TimesResultType, &times_result_desc) > < 0) > + return NULL; > PyModule_AddObject(m, "times_result", (PyObject *)&TimesResultType); > > uname_result_desc.name = MODNAME ".uname_result"; > - PyStructSequence_InitType(&UnameResultType, &uname_result_desc); > + if (PyStructSequence_InitType2(&UnameResultType, &uname_result_desc) > < 0) > + return NULL; > PyModule_AddObject(m, "uname_result", (PyObject *)&UnameResultType); > > #ifdef __APPLE__ > @@ -11648,7 +11657,6 @@ > initialized = 1; > > return m; > - > } > > #ifdef __cplusplus > diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c > --- a/Modules/pwdmodule.c > +++ b/Modules/pwdmodule.c > @@ -216,8 +216,9 @@ > return NULL; > > if (!initialized) { > - PyStructSequence_InitType(&StructPwdType, > - &struct_pwd_type_desc); > + if (PyStructSequence_InitType2(&StructPwdType, > + &struct_pwd_type_desc) < 0) > + return NULL; > initialized = 1; > } > Py_INCREF((PyObject *) &StructPwdType); > diff --git a/Modules/resource.c b/Modules/resource.c > --- a/Modules/resource.c > +++ b/Modules/resource.c > @@ -263,9 +263,12 @@ > /* Add some symbolic constants to the module */ > Py_INCREF(PyExc_OSError); > PyModule_AddObject(m, "error", PyExc_OSError); > - if (!initialized) > - PyStructSequence_InitType(&StructRUsageType, > - &struct_rusage_desc); > + if (!initialized) { > + if (PyStructSequence_InitType2(&StructRUsageType, > + &struct_rusage_desc) < 0) > + return NULL; > + } > + > Py_INCREF(&StructRUsageType); > PyModule_AddObject(m, "struct_rusage", > (PyObject*) &StructRUsageType); > diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c > --- a/Modules/signalmodule.c > +++ b/Modules/signalmodule.c > @@ -978,9 +978,10 @@ > return NULL; > > #if defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT) > - if (!initialized) > - PyStructSequence_InitType(&SiginfoType, &struct_siginfo_desc); > - > + if (!initialized) { > + if (PyStructSequence_InitType2(&SiginfoType, > &struct_siginfo_desc) < 0) > + return NULL; > + } > Py_INCREF((PyObject*) &SiginfoType); > PyModule_AddObject(m, "struct_siginfo", (PyObject*) &SiginfoType); > initialized = 1; > diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c > --- a/Modules/spwdmodule.c > +++ b/Modules/spwdmodule.c > @@ -196,9 +196,11 @@ > m=PyModule_Create(&spwdmodule); > if (m == NULL) > return NULL; > - if (!initialized) > - PyStructSequence_InitType(&StructSpwdType, > - &struct_spwd_type_desc); > + if (!initialized) { > + if (PyStructSequence_InitType2(&StructSpwdType, > + &struct_spwd_type_desc) < 0) > + return NULL; > + } > Py_INCREF((PyObject *) &StructSpwdType); > PyModule_AddObject(m, "struct_spwd", (PyObject *) &StructSpwdType); > initialized = 1; > diff --git a/Modules/timemodule.c b/Modules/timemodule.c > --- a/Modules/timemodule.c > +++ b/Modules/timemodule.c > @@ -1476,8 +1476,9 @@ > PyInit_timezone(m); > > if (!initialized) { > - PyStructSequence_InitType(&StructTimeType, > - &struct_time_type_desc); > + if (PyStructSequence_InitType2(&StructTimeType, > + &struct_time_type_desc) < 0) > + return NULL; > > #ifdef MS_WINDOWS > winver.dwOSVersionInfoSize = sizeof(winver); > diff --git a/Objects/floatobject.c b/Objects/floatobject.c > --- a/Objects/floatobject.c > +++ b/Objects/floatobject.c > @@ -1853,7 +1853,7 @@ > float_new, /* tp_new */ > }; > > -void > +int > _PyFloat_Init(void) > { > /* We attempt to determine if this machine is using IEEE > @@ -1903,8 +1903,11 @@ > float_format = detected_float_format; > > /* Init float info */ > - if (FloatInfoType.tp_name == 0) > - PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc); > + if (FloatInfoType.tp_name == NULL) { > + if (PyStructSequence_InitType2(&FloatInfoType, &floatinfo_desc) < > 0) > + return 0; > + } > + return 1; > } > > int > diff --git a/Objects/longobject.c b/Objects/longobject.c > --- a/Objects/longobject.c > +++ b/Objects/longobject.c > @@ -5059,8 +5059,10 @@ > } > #endif > /* initialize int_info */ > - if (Int_InfoType.tp_name == 0) > - PyStructSequence_InitType(&Int_InfoType, &int_info_desc); > + if (Int_InfoType.tp_name == NULL) { > + if (PyStructSequence_InitType2(&Int_InfoType, &int_info_desc) < 0) > + return 0; > + } > > return 1; > } > diff --git a/Objects/structseq.c b/Objects/structseq.c > --- a/Objects/structseq.c > +++ b/Objects/structseq.c > @@ -320,12 +320,13 @@ > structseq_new, /* tp_new */ > }; > > -void > -PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc) > +int > +PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc > *desc) > { > PyObject *dict; > PyMemberDef* members; > int n_members, n_unnamed_members, i, k; > + PyObject *v; > > #ifdef Py_TRACE_REFS > /* if the type object was chained, unchain it first > @@ -347,8 +348,10 @@ > type->tp_doc = desc->doc; > > members = PyMem_NEW(PyMemberDef, n_members-n_unnamed_members+1); > - if (members == NULL) > - return; > + if (members == NULL) { > + PyErr_NoMemory(); > + return -1; > + } > > for (i = k = 0; i < n_members; ++i) { > if (desc->fields[i].name == PyStructSequence_UnnamedField) > @@ -366,22 +369,33 @@ > type->tp_members = members; > > if (PyType_Ready(type) < 0) > - return; > + return -1; > Py_INCREF(type); > > dict = type->tp_dict; > #define SET_DICT_FROM_INT(key, value) \ > do { \ > - PyObject *v = PyLong_FromLong((long) value); \ > - if (v != NULL) { \ > - PyDict_SetItemString(dict, key, v); \ > + v = PyLong_FromLong((long) value); \ > + if (v == NULL) \ > + return -1; \ > + if (PyDict_SetItemString(dict, key, v) < 0) { \ > Py_DECREF(v); \ > + return -1; \ > } \ > + Py_DECREF(v); \ > } while (0) > > SET_DICT_FROM_INT(visible_length_key, desc->n_in_sequence); > SET_DICT_FROM_INT(real_length_key, n_members); > SET_DICT_FROM_INT(unnamed_fields_key, n_unnamed_members); > + > + return 0; > +} > + > +void > +PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc) > +{ > + (void)PyStructSequence_InitType2(type, desc); > } > > PyTypeObject* > @@ -390,8 +404,11 @@ > PyTypeObject *result; > > result = (PyTypeObject*)PyType_GenericAlloc(&PyType_Type, 0); > - if (result != NULL) { > - PyStructSequence_InitType(result, desc); > + if (result == NULL) > + return NULL; > + if (PyStructSequence_InitType2(result, desc) < 0) { > + Py_DECREF(result); > + return NULL; > } > return result; > } > diff --git a/Python/pythonrun.c b/Python/pythonrun.c > --- a/Python/pythonrun.c > +++ b/Python/pythonrun.c > @@ -328,7 +328,8 @@ > if (!PyByteArray_Init()) > Py_FatalError("Py_Initialize: can't init bytearray"); > > - _PyFloat_Init(); > + if (!_PyFloat_Init()) > + Py_FatalError("Py_Initialize: can't init float"); > > interp->modules = PyDict_New(); > if (interp->modules == NULL) > diff --git a/Python/sysmodule.c b/Python/sysmodule.c > --- a/Python/sysmodule.c > +++ b/Python/sysmodule.c > @@ -1634,8 +1634,10 @@ > SET_SYS_FROM_STRING("int_info", > PyLong_GetInfo()); > /* initialize hash_info */ > - if (Hash_InfoType.tp_name == 0) > - PyStructSequence_InitType(&Hash_InfoType, &hash_info_desc); > + if (Hash_InfoType.tp_name == NULL) { > + if (PyStructSequence_InitType2(&Hash_InfoType, &hash_info_desc) < > 0) > + return NULL; > + } > SET_SYS_FROM_STRING("hash_info", > get_hash_info()); > SET_SYS_FROM_STRING("maxunicode", > @@ -1676,8 +1678,11 @@ > } > > /* version_info */ > - if (VersionInfoType.tp_name == 0) > - PyStructSequence_InitType(&VersionInfoType, &version_info_desc); > + if (VersionInfoType.tp_name == NULL) { > + if (PyStructSequence_InitType2(&VersionInfoType, > + &version_info_desc) < 0) > + return NULL; > + } > version_info = make_version_info(); > SET_SYS_FROM_STRING("version_info", version_info); > /* prevent user from creating new instances */ > @@ -1688,8 +1693,10 @@ > SET_SYS_FROM_STRING("implementation", make_impl_info(version_info)); > > /* flags */ > - if (FlagsType.tp_name == 0) > - PyStructSequence_InitType(&FlagsType, &flags_desc); > + if (FlagsType.tp_name == 0) { > + if (PyStructSequence_InitType2(&FlagsType, &flags_desc) < 0) > + return NULL; > + } > SET_SYS_FROM_STRING("flags", make_flags()); > /* prevent user from creating new instances */ > FlagsType.tp_init = NULL; > @@ -1699,7 +1706,9 @@ > #if defined(MS_WINDOWS) > /* getwindowsversion */ > if (WindowsVersionType.tp_name == 0) > - PyStructSequence_InitType(&WindowsVersionType, > &windows_version_desc); > + if (PyStructSequence_InitType2(&WindowsVersionType, > + &windows_version_desc) < 0) > + return NULL; > /* prevent user from creating new instances */ > WindowsVersionType.tp_init = NULL; > WindowsVersionType.tp_new = NULL; > diff --git a/Python/thread.c b/Python/thread.c > --- a/Python/thread.c > +++ b/Python/thread.c > @@ -399,8 +399,10 @@ > int len; > #endif > > - if (ThreadInfoType.tp_name == 0) > - PyStructSequence_InitType(&ThreadInfoType, &threadinfo_desc); > + if (ThreadInfoType.tp_name == 0) { > + if (PyStructSequence_InitType2(&ThreadInfoType, &threadinfo_desc) > < 0) > + return NULL; > + } > > threadinfo = PyStructSequence_New(&ThreadInfoType); > if (threadinfo == NULL) > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins > >

3 2