Mailman 3 July 2012 - Python-Dev

2.7 releases
by Thomas Heller 27 Jul '12

27 Jul '12

Will there be more 2.7 bugfix releases, and when the next one? In other words; if I submit a patch and it is accepted, can I expect that patch be committed also to the 2.7 branch? Thanks, Thomas Been a long time that I've been here - but still using Python (2.7 now) more and more...

7 7

Summary of Python tracker Issues
by Python tracker 27 Jul '12

27 Jul '12

ACTIVITY SUMMARY (2012-07-20 - 2012-07-27) 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 3532 ( +4) closed 23716 (+58) total 27248 (+62) Open issues with patches: 1514 Issues opened (48) ================== #14330: don't use host python, use host search paths for host compiler http://bugs.python.org/issue14330 reopened by ezio.melotti #15231: update PyPI upload doc to say --no-raw passed to rst2html.py http://bugs.python.org/issue15231 reopened by eric.araujo #15402: Correct __sizeof__ support for struct http://bugs.python.org/issue15402 reopened by jcea #15411: os.chmod() does not follow symlinks on Windows http://bugs.python.org/issue15411 opened by ishimoto #15412: Note in documentation for weakrefs http://bugs.python.org/issue15412 opened by sbt #15414: os.path.join behavior on Windows (ntpath.join) is unexpected a http://bugs.python.org/issue15414 opened by r.david.murray #15415: Add temp_dir() and change_cwd() to test.support http://bugs.python.org/issue15415 opened by cjerdonek #15417: Add support for csh and fish in venv activation scripts http://bugs.python.org/issue15417 opened by asvetlov #15418: 2to3 docs should mention setup.py fixes required to install co http://bugs.python.org/issue15418 opened by techtonik #15419: distutils: build_py_2to3 should use a separate build directory http://bugs.python.org/issue15419 opened by techtonik #15421: Calendar.itermonthdates OverflowError http://bugs.python.org/issue15421 opened by ced #15422: Get rid of PyCFunction_New macro http://bugs.python.org/issue15422 opened by asvetlov #15424: __sizeof__ of array should include size of items http://bugs.python.org/issue15424 opened by Pankrat #15425: Another strange Tracebacks with importlib http://bugs.python.org/issue15425 opened by amaury.forgeotdarc #15426: On a x86_64 Linux workstation, the build-from-source is borked http://bugs.python.org/issue15426 opened by Shocked.Pancake #15427: Describe use of args parameter of argparse.ArgumentParser.pars http://bugs.python.org/issue15427 opened by bethard #15428: add "Name Collision" section to argparse docs http://bugs.python.org/issue15428 opened by bethard #15430: Improve filecmp documentation http://bugs.python.org/issue15430 opened by orsenthil #15431: Cannot build importlib.h on Windows http://bugs.python.org/issue15431 opened by amaury.forgeotdarc #15432: gzip.py: mtime argument only since python 2.7 http://bugs.python.org/issue15432 opened by gomyhr #15436: __sizeof__ is not documented http://bugs.python.org/issue15436 opened by storchaka #15437: Merge Doc/ACKS.txt names into Misc/ACKS http://bugs.python.org/issue15437 opened by cjerdonek #15438: Incredible issue in math.pow http://bugs.python.org/issue15438 opened by andrea.bergamini #15439: Include Misc/ACKS names into the documentation http://bugs.python.org/issue15439 opened by cjerdonek #15440: multiprocess fails to re-raise exception which has mandatory a http://bugs.python.org/issue15440 opened by Bala.FA #15441: test_posixpath fails on Japanese edition of Windows http://bugs.python.org/issue15441 opened by ishimoto #15442: Expand the list of default dirs filecmp.dircmp ignores http://bugs.python.org/issue15442 opened by eli.bendersky #15443: datetime module has no support for nanoseconds http://bugs.python.org/issue15443 opened by goshawk #15444: Incorrectly written contributor's names http://bugs.python.org/issue15444 opened by storchaka #15447: A file is not properly closed by webbrowser._invoke http://bugs.python.org/issue15447 opened by anton.barkovsky #15448: utimes() functions fail with ENOSYS even when detected by conf http://bugs.python.org/issue15448 opened by richmose #15450: Allow dircmp.subdirs to behave well under subclassing http://bugs.python.org/issue15450 opened by cjerdonek #15451: PATH is not honored in subprocess.Popen in win32 http://bugs.python.org/issue15451 opened by Grissiom.Gu #15452: Eliminate the use of eval() in the logging config implementati http://bugs.python.org/issue15452 opened by ncoghlan #15453: ctype with packed bitfields does not match native compiler http://bugs.python.org/issue15453 opened by Mike.Castle #15454: Allow dircmp.report() output stream to be customized http://bugs.python.org/issue15454 opened by cjerdonek #15455: index entries not showing up in glossary http://bugs.python.org/issue15455 opened by cjerdonek #15457: consistent treatment of generator terminology http://bugs.python.org/issue15457 opened by cjerdonek #15459: ctypes Structures with subclassed types in the _fields_ list http://bugs.python.org/issue15459 opened by theller #15460: SQLite cursor.description is not DB-API compatible http://bugs.python.org/issue15460 opened by CharlieX #15463: test_faulthandler can fail if install path is too long http://bugs.python.org/issue15463 opened by ned.deily #15464: ssl: add set_msg_callback function http://bugs.python.org/issue15464 opened by tweksteen #15465: Improved documentation for C API version info http://bugs.python.org/issue15465 opened by ncoghlan #15466: Python/importlib.h is different on 32bit and 64bit http://bugs.python.org/issue15466 opened by amaury.forgeotdarc #15467: Updating __sizeof__ tests http://bugs.python.org/issue15467 opened by storchaka #15468: Edit docs to hide hashlib.md5() http://bugs.python.org/issue15468 opened by dholth #15469: Correct __sizeof__ support for deque http://bugs.python.org/issue15469 opened by storchaka #15470: Stuck/hang when reading ssl object http://bugs.python.org/issue15470 opened by seamus.mckenna Most recent 15 issues with no replies (15) ========================================== #15470: Stuck/hang when reading ssl object http://bugs.python.org/issue15470 #15469: Correct __sizeof__ support for deque http://bugs.python.org/issue15469 #15468: Edit docs to hide hashlib.md5() http://bugs.python.org/issue15468 #15467: Updating __sizeof__ tests http://bugs.python.org/issue15467 #15465: Improved documentation for C API version info http://bugs.python.org/issue15465 #15460: SQLite cursor.description is not DB-API compatible http://bugs.python.org/issue15460 #15455: index entries not showing up in glossary http://bugs.python.org/issue15455 #15448: utimes() functions fail with ENOSYS even when detected by conf http://bugs.python.org/issue15448 #15442: Expand the list of default dirs filecmp.dircmp ignores http://bugs.python.org/issue15442 #15440: multiprocess fails to re-raise exception which has mandatory a http://bugs.python.org/issue15440 #15432: gzip.py: mtime argument only since python 2.7 http://bugs.python.org/issue15432 #15428: add "Name Collision" section to argparse docs http://bugs.python.org/issue15428 #15427: Describe use of args parameter of argparse.ArgumentParser.pars http://bugs.python.org/issue15427 #15425: Another strange Tracebacks with importlib http://bugs.python.org/issue15425 #15422: Get rid of PyCFunction_New macro http://bugs.python.org/issue15422 Most recent 15 issues waiting for review (15) ============================================= #15469: Correct __sizeof__ support for deque http://bugs.python.org/issue15469 #15467: Updating __sizeof__ tests http://bugs.python.org/issue15467 #15464: ssl: add set_msg_callback function http://bugs.python.org/issue15464 #15459: ctypes Structures with subclassed types in the _fields_ list http://bugs.python.org/issue15459 #15457: consistent treatment of generator terminology http://bugs.python.org/issue15457 #15450: Allow dircmp.subdirs to behave well under subclassing http://bugs.python.org/issue15450 #15448: utimes() functions fail with ENOSYS even when detected by conf http://bugs.python.org/issue15448 #15447: A file is not properly closed by webbrowser._invoke http://bugs.python.org/issue15447 #15444: Incorrectly written contributor's names http://bugs.python.org/issue15444 #15441: test_posixpath fails on Japanese edition of Windows http://bugs.python.org/issue15441 #15437: Merge Doc/ACKS.txt names into Misc/ACKS http://bugs.python.org/issue15437 #15431: Cannot build importlib.h on Windows http://bugs.python.org/issue15431 #15430: Improve filecmp documentation http://bugs.python.org/issue15430 #15426: On a x86_64 Linux workstation, the build-from-source is borked http://bugs.python.org/issue15426 #15424: __sizeof__ of array should include size of items http://bugs.python.org/issue15424 Top 10 most discussed issues (10) ================================= #15402: Correct __sizeof__ support for struct http://bugs.python.org/issue15402 35 msgs #15438: Incredible issue in math.pow http://bugs.python.org/issue15438 21 msgs #15441: test_posixpath fails on Japanese edition of Windows http://bugs.python.org/issue15441 17 msgs #15437: Merge Doc/ACKS.txt names into Misc/ACKS http://bugs.python.org/issue15437 15 msgs #15439: Include Misc/ACKS names into the documentation http://bugs.python.org/issue15439 14 msgs #15443: datetime module has no support for nanoseconds http://bugs.python.org/issue15443 14 msgs #14578: importlib doesn't check Windows registry for paths http://bugs.python.org/issue14578 13 msgs #15381: Optimize BytesIO to so less reallocations when written, simila http://bugs.python.org/issue15381 11 msgs #15444: Incorrectly written contributor's names http://bugs.python.org/issue15444 11 msgs #1692335: Fix exception pickling: Move initial args assignment to BaseEx http://bugs.python.org/issue1692335 10 msgs Issues closed (56) ================== #4221: inconsistent exception from int is confusing http://bugs.python.org/issue4221 closed by flox #7003: finish documentation of user local paths http://bugs.python.org/issue7003 closed by orsenthil #7163: IDLE suppresses sys.stdout.write() return value http://bugs.python.org/issue7163 closed by loewis #7578: Behavior of operations on a closed file object is not document http://bugs.python.org/issue7578 closed by pitrou #7710: Inconsistent Exception for int() conversion http://bugs.python.org/issue7710 closed by flox #7996: concurrency problem in regrtest -jX http://bugs.python.org/issue7996 closed by rosslagerwall #9610: buildbot: uncaptured python exception (smtpd), but no failure http://bugs.python.org/issue9610 closed by flox #9692: UnicodeDecodeError in ElementTree.tostring() http://bugs.python.org/issue9692 closed by flox #9772: test_pep277 failure on AMD64 debian parallel buildbot http://bugs.python.org/issue9772 closed by flox #9773: test_tarfile fails because of inaccurate mtime on AMD64 debian http://bugs.python.org/issue9773 closed by flox #9783: _elementtree.c warnings under 64-bit Windows http://bugs.python.org/issue9783 closed by flox #10017: pprint.pprint raises TypeError on dictionaries with user-defin http://bugs.python.org/issue10017 closed by flox #12353: argparse cannot handle empty arguments http://bugs.python.org/issue12353 closed by r.david.murray #13818: argparse: -h listening required options under optional argumen http://bugs.python.org/issue13818 closed by bethard #13922: argparse handling multiple "--" in args improperly http://bugs.python.org/issue13922 closed by r.david.murray #14197: OS X framework builds do not create ABI-suffixed libpython3.x http://bugs.python.org/issue14197 closed by ned.deily #14392: type=bool doesn't raise error in argparse.Action http://bugs.python.org/issue14392 closed by shima__shima #14449: argparse optional arguments should follow getopt_long(3) http://bugs.python.org/issue14449 closed by bethard #14579: CVE-2012-2135: Vulnerability in the utf-16 decoder after error http://bugs.python.org/issue14579 closed by pitrou #14895: test_warnings.py EnvironmentVariableTests is a bad test http://bugs.python.org/issue14895 closed by brett.cannon #14998: pprint._safe_key is not always safe enough http://bugs.python.org/issue14998 closed by flox #15041: tkinter documentation: update "see also" list http://bugs.python.org/issue15041 closed by asvetlov #15063: Source code links for JSON documentation http://bugs.python.org/issue15063 closed by orsenthil #15091: ImportError when package is symlinked on Unix http://bugs.python.org/issue15091 closed by brett.cannon #15093: ntpath.isdir returns False for directory symlinks http://bugs.python.org/issue15093 closed by jason.coombs #15094: Incorrectly placed #endif in _tkinter.c. http://bugs.python.org/issue15094 closed by asvetlov #15168: Move importlib.test to test.importlib http://bugs.python.org/issue15168 closed by brett.cannon #15184: Test failure in test_sysconfig_module http://bugs.python.org/issue15184 closed by ned.deily #15188: test_ldshared_value failure on OS X using python.org Pythons http://bugs.python.org/issue15188 closed by ned.deily #15195: test_distutils fails when ARCHFLAGS is set on a Mac http://bugs.python.org/issue15195 closed by ned.deily #15232: email.generator.Generator doesn't mangle "From " lines in MIME http://bugs.python.org/issue15232 closed by r.david.murray #15250: document that filecmp.dircmp comparisons are "shallow" http://bugs.python.org/issue15250 closed by orsenthil #15271: argparse: repeatedly specifying the same argument ignores the http://bugs.python.org/issue15271 closed by bethard #15320: thread-safety issue in regrtest.main() http://bugs.python.org/issue15320 closed by pitrou #15327: Argparse: main arguments and subparser arguments indistinguish http://bugs.python.org/issue15327 closed by bethard #15336: Argparse required arguments incorrectly displayed as optional http://bugs.python.org/issue15336 closed by bethard #15353: ld: library not found for -lpython3.3m because of wrong LDFLAG http://bugs.python.org/issue15353 closed by ned.deily #15406: Deprecation Warning fix on ctypes module test http://bugs.python.org/issue15406 closed by meador.inge #15407: CSV parser fails to iterate properly on 2.6.6 http://bugs.python.org/issue15407 closed by r.david.murray #15409: Deprecation Warning fix on cookiejar module http://bugs.python.org/issue15409 closed by meador.inge #15410: urllib.request.Request.is_unverifiable deprecation documentati http://bugs.python.org/issue15410 closed by meador.inge #15413: os.times() disappeared under Windows http://bugs.python.org/issue15413 closed by pitrou #15416: 3 * [] gives a list of 3 cross-referenced lists, a[1]='blah' w http://bugs.python.org/issue15416 closed by amaury.forgeotdarc #15420: issue6964 reminder http://bugs.python.org/issue15420 closed by loewis #15423: Minidom tries to parse tags inside of <script> tag http://bugs.python.org/issue15423 closed by r.david.murray #15429: types.NoneType missing http://bugs.python.org/issue15429 closed by r.david.murray #15433: argparse usage line is wrong http://bugs.python.org/issue15433 closed by bethard #15434: __import__() problem in 3.3 http://bugs.python.org/issue15434 closed by brett.cannon #15435: Strange behavior when AttributeError raise inside a property g http://bugs.python.org/issue15435 closed by ncoghlan #15445: Ability to do code injection via logging module configuration http://bugs.python.org/issue15445 closed by python-dev #15446: Eval Recursion SIGSEGV http://bugs.python.org/issue15446 closed by r.david.murray #15449: Optional size argument for readline() http://bugs.python.org/issue15449 closed by pitrou #15456: Correct __sizeof__ support for code objects http://bugs.python.org/issue15456 closed by loewis #15458: Add python-config --configdir option http://bugs.python.org/issue15458 closed by barry #15461: os.stat() 's inappropriate behavior when dealing with a broken http://bugs.python.org/issue15461 closed by r.david.murray #15462: UTF8 BOM incorrectly prepended syslog messages when using rsys http://bugs.python.org/issue15462 closed by r.david.murray

1 0

Who's maintaining Sphinx nowadays?
by Chris Withers 27 Jul '12

27 Jul '12

Hi All, Sorry if this is considered slightly off topic, but Sphinx is the tool we use for the Python core docs so: Who's looking after Sphinx nowadays? I've hit what I consider to be a bug: https://groups.google.com/group/sphinx-dev/browse_thread/thread/197fc26ba57… So I forked on bitbucket and wanted to work up a fix, but running the unit tests on my fresh fork was problematic: https://groups.google.com/group/sphinx-dev/browse_thread/thread/1e1f45978a8… The sphinx-dev group seems devoid of sphinx developers currently, so thought I'd ask here to see if anyone could point me in the right direction ;-) cheers, Chris -- Simplistix - Content Management, Batch Processing & Python Consulting - http://www.simplistix.co.uk

2 2

Re: [Python-Dev] [Python-checkins] cpython (3.2): Issue #15445: Updated logging configuration documentation to highlight
by Nick Coghlan 26 Jul '12

26 Jul '12

On Thu, Jul 26, 2012 at 4:20 AM, vinay.sajip <python-checkins(a)python.org> wrote: > + .. note:: Because portions of the configuration are passed through > + :func:`eval`, use of this function may open its users to a security risk. > + While the function only binds to a socket on ``localhost``, and so does > + not accept connections from remote machines, there are scenarios where > + untrusted code could be run under the account of the process which calls > + :func:`listen`. Specifically, if the process calling :func:`listen` runs > + on a multi-user machine where users cannot trust each other, then a > + malicious user could arrange to run essentially arbitrary code in a > + victim user's process, simply by connecting to the victim's > + :func:`listen` socket and sending a configuration which runs whatever > + code the attacker wants to have executed in the victim's process. This is > + especially easy to do if the default port is used, but not hard even if a > + different port is used). Looking at PEP 391, it appears it should be possible to replace the current use of eval() with a combination of the much safer ast.literal_eval() and the str.format attribute/item access micro-language. Worth exploring for 3.4 (http://bugs.python.org/issue15452), as it would be better to actually try to close this attack vector rather than just documenting that it exists. Cheers, Nick. -- Nick Coghlan | ncoghlan(a)gmail.com | Brisbane, Australia

1 0

Building python 2.7.3 with Visual Studio 2012 (VS11.0)
by Wim Colgate 24 Jul '12

24 Jul '12

Please forgive me if this is not the prescribed method for asking this question. For various reasons, I would like to build python 2.7.3 from source using the latest VS tools (VS11.0 is in RC -- which is close enough for my purposes). I have seen the various sub-directories (VC6, VS7.1 and VS8.0) in the sources for specific VS tool chains. I have also seen the patch for VS 10.0 (http://wiki.python.org/moin/VS2010). If building with VS11.0, is there more than just applying the equivalent VS10.0 patch to also include VS11? Are the other VS sub-directories unneeded? Regards, Wim

3 2

2to3 porting HOWTO: setup.py question
by Oscar Benjamin 24 Jul '12

24 Jul '12

On 22 July 2012 14:08, R. David Murray <rdmurray(a)bitdance.com> wrote: > On Sun, 22 Jul 2012 11:21:38 +0300, anatoly techtonik <techtonik(a)gmail.com> > wrote: > > http://docs.python.org/py3k/howto/pyporting.html#during-installation > > > > What's the point in making implicit Python 3 check here: > > try: # Python 3 > > from distutils.command.build_py import build_py_2to3 as build_py > > except ImportError: # Python 2 > > from distutils.command.build_py import build_py > > > > instead of explicit check like: > > import sys > > if sys.version_info[0] >= 3: > > from distutils.command.build_py import build_py_2to3 as build_py > > It's called testing for the thing that actually matters, rather than > testing a constant with a much broader meaning. Yes, in this case the > results are the same, but IMO it is better programming practice to test > the thing that actually matters when you can. I recently changed a setup.py from try/ImportError to an explicit sys.version_info check. I'm not totally sure how to reproduce this but I had a problem where I was installing into a 2.x virtualenv and it was running 2to3 during install and subsequently failing to import the 3.x code (the problem didn't occur when using the same python that generated the virtualenv). I may be wrong but I imagined that sometimes build_py_2to3 is importable on 2.x, perhaps for cross-building or something. In any case 'testing the thing that matters' means testing what version of Python you are about to install into not whether the python version supports running 2to3. Cheers, Oscar.

8 11

Re: [Python-Dev] [Python-checkins] cpython (merge 3.2 -> default): MERGE: Better test for Issue #15402: Add a __sizeof__ method to struct.Struct
by Meador Inge 24 Jul '12

24 Jul '12

On Mon, Jul 23, 2012 at 11:17 AM, jesus.cea <python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/b9a3ed1b14b9 > changeset: 78260:b9a3ed1b14b9 > parent: 78257:03063e718f5f > parent: 78259:1911e192af0d > user: Jesus Cea <jcea(a)jcea.es> > date: Mon Jul 23 18:16:18 2012 +0200 > summary: > MERGE: Better test for Issue #15402: Add a __sizeof__ method to struct.Struct > > files: > Doc/ACKS.txt | 1 + > Lib/test/test_struct.py | 8 ++++---- > 2 files changed, 5 insertions(+), 4 deletions(-) Jesús, Doc/ACKS.txt is *only* for acknowledging documentation contributions. Serhiy is already in Misc/ACKS. No need to add him to Doc/ACKS.txt. As for the tests, I intentionally kept them the way that Serhiy contributed them -- using >= instead of >. I kept them this way because we also discussed in issue14596 the prospect of optimizing the way repeat counts are handled. These tests would start failing if (when) that optimization happens. So, neither of these changes are really necessary. Although, it wouldn't hurt to have *additional* tests using the > relation. > > diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt > --- a/Doc/ACKS.txt > +++ b/Doc/ACKS.txt > @@ -205,6 +205,7 @@ > * Anthony Starks > * Greg Stein > * Peter Stoehr > + * Serhiy Storchaka > * Mark Summerfield > * Reuben Sumner > * Kalle Svensson > diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py > --- a/Lib/test/test_struct.py > +++ b/Lib/test/test_struct.py > @@ -575,12 +575,12 @@ > def test_sizeof(self): > self.assertGreater(sys.getsizeof(struct.Struct('BHILfdspP')), > sys.getsizeof(struct.Struct('B'))) > - self.assertGreaterEqual(sys.getsizeof(struct.Struct('123B')), > + self.assertGreater(sys.getsizeof(struct.Struct('123B')), > sys.getsizeof(struct.Struct('B'))) > - self.assertGreaterEqual(sys.getsizeof(struct.Struct('B' * 123)), > + self.assertGreater(sys.getsizeof(struct.Struct('B' * 1234)), > sys.getsizeof(struct.Struct('123B'))) > - self.assertGreaterEqual(sys.getsizeof(struct.Struct('123xB')), > - sys.getsizeof(struct.Struct('B'))) > + self.assertGreater(sys.getsizeof(struct.Struct('1234B')), > + sys.getsizeof(struct.Struct('123B'))) > > def test_main(): > run_unittest(StructTest) > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins > -- # Meador

9 15

Doc/ACKS and Misc/ACKS
by Chris Jerdonek 23 Jul '12

23 Jul '12

> Date: Mon, 23 Jul 2012 19:17:32 +0200 > From: Antoine Pitrou <solipsis(a)pitrou.net> > To: python-dev(a)python.org > Subject: [Python-Dev] Doc/ACKS and Misc/ACKS > >> > Doc/ACKS.txt is *only* for acknowledging documentation >> > contributions. Serhiy is already in Misc/ACKS. No need to add him >> > to Doc/ACKS.txt. >> > That said, we could probably merge Doc/ACKS and Misc/ACKS (*). There > doesn't seem to be any strong argument for separating doc contributions > from other contributions. > > (*) I think perhaps ?ric already proposed it at some point I created an issue for this here: http://bugs.python.org/issue15437 --Chris

1 0

venv scripts for fish and csh shells
by Andrew Svetlov 23 Jul '12

23 Jul '12

virtualenv has virtualenv.csh and virtualenv.fish files. Is there any reason for restricting venv to bash/zsh only? -- Thanks, Andrew Svetlov

5 9

Re: [Python-Dev] [Python-checkins] cpython (merge 3.2 -> default): Merge #15232: correctly mangle From lines in MIME preamble and epilogue
by Meador Inge 23 Jul '12

23 Jul '12

On Sun, Jul 22, 2012 at 8:55 PM, r.david.murray <python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/80b81658455b > changeset: 78246:80b81658455b > parent: 78244:c43d73277756 > parent: 78245:b97f65f2298d > user: R David Murray <rdmurray(a)bitdance.com> > date: Sun Jul 22 21:53:54 2012 -0400 > summary: > Merge #15232: correctly mangle From lines in MIME preamble and epilogue > > files: > Lib/email/generator.py | 12 ++++++++- > Lib/test/test_email/test_email.py | 22 +++++++++++++++++++ > Misc/NEWS | 3 ++ > 3 files changed, 35 insertions(+), 2 deletions(-) I'm not quite sure what happened, but something seems to have gone wrong with this merge. After doing the following while on the "default" branch: $ hg merge 3.2 I see: $ hg st M Lib/email/generator.py M Lib/test/test_email/test_email.py M Misc/NEWS and a bunch of conflicts in 'Misc/NEWS'. > > diff --git a/Lib/email/generator.py b/Lib/email/generator.py > --- a/Lib/email/generator.py > +++ b/Lib/email/generator.py > @@ -252,7 +252,11 @@ > msg.set_boundary(boundary) > # If there's a preamble, write it out, with a trailing CRLF > if msg.preamble is not None: > - self.write(msg.preamble + self._NL) > + if self._mangle_from_: > + preamble = fcre.sub('>From ', msg.preamble) > + else: > + preamble = msg.preamble > + self.write(preamble + self._NL) > # dash-boundary transport-padding CRLF > self.write('--' + boundary + self._NL) > # body-part > @@ -270,7 +274,11 @@ > self.write(self._NL + '--' + boundary + '--') > if msg.epilogue is not None: > self.write(self._NL) > - self.write(msg.epilogue) > + if self._mangle_from_: > + epilogue = fcre.sub('>From ', msg.epilogue) > + else: > + epilogue = msg.epilogue > + self.write(epilogue) > > def _handle_multipart_signed(self, msg): > # The contents of signed parts has to stay unmodified in order to keep > diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py > --- a/Lib/test/test_email/test_email.py > +++ b/Lib/test/test_email/test_email.py > @@ -1283,6 +1283,28 @@ > Blah blah blah > """) > > + def test_mangle_from_in_preamble_and_epilog(self): > + s = StringIO() > + g = Generator(s, mangle_from_=True) > + msg = email.message_from_string(textwrap.dedent("""\ > + From: foo(a)bar.com > + Mime-Version: 1.0 > + Content-Type: multipart/mixed; boundary=XXX > + > + From somewhere unknown > + > + --XXX > + Content-Type: text/plain > + > + foo > + > + --XXX-- > + > + From somewhere unknowable > + """)) > + g.flatten(msg) > + self.assertEqual(len([1 for x in s.getvalue().split('\n') > + if x.startswith('>From ')]), 2) > > > # Test the basic MIMEAudio class > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -52,6 +52,9 @@ > Library > ------- > > +- Issue #15232: when mangle_from is True, email.Generator now correctly mangles > + lines that start with 'From' that occur in a MIME preamble or epilogue. > + > - Issue #15094: Incorrectly placed #endif in _tkinter.c. > Patch by Serhiy Storchaka. > > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins > -- # Meador

1 1