Mailman 3 February 2016 - Python-Dev

speed.python.org
by Zachary Ware 08 Feb '16

08 Feb '16

I'm happy to announce that speed.python.org is finally functional! There's not much there yet, as each benchmark builder has only sent one result so far (and one of those involved a bit of cheating on my part), but it's there. There are likely to be rough edges that still need smoothing out. When you find them, please report them at https://github.com/zware/codespeed/issues or on the speed(a)python.org mailing list. Many thanks to Intel for funding the work to get it set up and to Brett Cannon and Benjamin Peterson for their reviews. Happy benchmarking, -- Zach

6 10

Syntax Highlightning for C API of CPython in VIM
by Stephane Wirtel 08 Feb '16

08 Feb '16

Hi everyone, With my talk "Exploring our Python Interpreter", I think this VIM plugin can be useful for the community. It's a syntax highlighter for the C API of CPython 3.5 and 3.6. I used Clang for the parsing and automatically generated the keywords for VIM. PyObject and the others typedefs of CPython will have the defined color of your favourite editor and it's the same for the enums, the typedefs, the functions and the macros. Where can you use this VIM plugin ? If you want to write a CPython extension or if you want to hack in the CPython code. Check this screenshot: http://i.imgur.com/0k13KOU.png Here is the repository: https://github.com/matrixise/cpython-vim-syntax Please, if you see some issues, tell me via an issue on Github. Thank you so much, Stephane -- Stéphane Wirtel - http://wirtel.be - @matrixise

1 0

PEP 0492 __aenter__ & __aexit__
by Daniel Miller 08 Feb '16

08 Feb '16

Hi Python-Dev Group, I am trying to implement __aenter__ and __aexit__ for the RethinkDB <https://rethinkdb.com> Python driver. Looking at the PEP I don't see any definitions as to what the expected parameters that __exit__ are supposed to take and couldn't find any other similar implementations. Is there a piece of documentation I should be looking at that I'm missing? https://www.python.org/dev/peps/pep-0492/#asynchronous-context-managers-and… Many thanks, Daniel

3 5

HackIllinois 2016 + Python
by Kevin Hong 08 Feb '16

08 Feb '16

Hi all! My name is Kevin and I am a staff member of HackIllinois, a 36-hour hackathon at the University of Illinois Urbana-Champaign where students from across the nation come to build some of the most innovative hardware and software projects. For highlights from last year’s event, check out go.hackillinois.org/video. >From February 19-21st 2016, HackIllinois returns and we are introducing a new initiative called OpenSource@HackIllinois to promote Open Source development during the event. This program is designed to provide students with the opportunity to meet and collaborate with experienced developers, like you all, who serve as a guide and mentor into the open source world. Over the course of the event, you and your group of hackers will build features for an open source project of your choosing. Please see http://www.hackillinois.org/opensource for more details! If you or any other open source developers you work with are interested in learning more about OpenSource@HackIllinois, feel free to email me at kevin.hong(a)hackillinois.org. I look forward to speaking with you soon! Best Regards, Kevin Hong

2 1

Google Summer of Code
by Victor Stinner 08 Feb '16

08 Feb '16

Hi, I would like to propose the FAT Python project subject to the Google Summer of Code: https://developers.google.com/open-source/gsoc/ I have a long list of optimization ideas for fatoptimizer: http://fatoptimizer.readthedocs.org/en/latest/todo.html The fatoptimizer project is written in pure Python and has a simple design. I implemented quite simple optimizations which are learnt at school. IMHO such project fits well for a student. Does the PSF already plan to apply to the GSoC? Are there other projects? Victor

3 2

More optimisation ideas
by Steve Dower 06 Feb '16

06 Feb '16

Since we're all talking about making Python faster, I thought I'd drop some previous ideas I've had here in case (1) someone wants to actually do them, and (2) they really are new ideas that haven't failed in the past. Mostly I was thinking about startup time. Here are the list of modules imported on clean startup on my Windows, US-English machine (from -v and cleaned up a bit): import _frozen_importlib import _imp import sys import '_warnings' import '_thread' import '_weakref' import '_frozen_importlib_external' import '_io' import 'marshal' import 'nt' import '_thread' import '_weakref' import 'winreg' import 'zipimport' import '_codecs' import 'codecs' import 'encodings.aliases' import 'encodings' import 'encodings.mbcs' import '_signal' import 'encodings.utf_8' import 'encodings.latin_1' import '_weakrefset' import 'abc' import 'io' import 'encodings.cp437' import 'errno' import '_stat' import 'stat' import 'genericpath' import 'ntpath' import '_collections_abc' import 'os' import '_sitebuiltins' import 'sysconfig' import '_locale' import '_bootlocale' import 'encodings.cp1252' import 'site' Obviously the easiest first thing is to remove or delay unnecessary imports. But a while ago I used a native profiler to trace through this and the most impactful modules were the encodings: import 'encodings.mbcs' import 'encodings.utf_8' import 'encodings.latin_1' import 'encodings.cp437' import 'encodings.cp1252' While I don't doubt that we need all of these for *some* reason, aliases, cp437 and cp1252 are relatively expensive modules to import. Mostly due to having large static dictionaries or data structures generated on startup. Given this is static and mostly read-only information[1], I see no reason why we couldn't either generate completely static versions of them, or better yet compile the resulting data structures into the core binary. ([1]: If being able to write to some of the encoding data is used by some people, I vote for breaking that for 3.6 and making it read-only.) This is probably the code snippet that bothered me the most: ### Encoding table encoding_table=codecs.charmap_build(decoding_table) It shows up in many of the encodings modules, and while it is not a bad function in itself, we are obviously generating a known data structure on every startup. Storing these in static data is a tradeoff between disk space and startup performance, and one I think it likely to be worthwhile. Anyway, just an idea if someone wants to try it and see what improvements we can get. I'd love to do it myself, but when it actually comes to finding time I keep coming up short. Cheers, Steve P.S. If you just want to discuss optimisation techniques or benchmarking in general, without specific application to CPython 3.6, there's a whole internet out there. Please don't make me the cause of a pointless centithread. :)

23 50

Summary of Python tracker Issues
by Python tracker 05 Feb '16

05 Feb '16

ACTIVITY SUMMARY (2016-01-29 - 2016-02-05) 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 5413 (+32) closed 32641 (+26) total 38054 (+58) Open issues with patches: 2367 Issues opened (50) ================== #25660: tabs don't work correctly in python repl http://bugs.python.org/issue25660 reopened by martin.panter #26239: distutils link-objects is not normalized http://bugs.python.org/issue26239 opened by jdfergason #26240: Docstring of the subprocess module should be cleaned up http://bugs.python.org/issue26240 opened by Antony.Lee #26243: zlib.compress level as keyword argument http://bugs.python.org/issue26243 opened by palaviv #26246: Code output toggle button uses removed jQuery method http://bugs.python.org/issue26246 opened by ccwang002 #26247: Document Chrome/Chromium for python2.7 http://bugs.python.org/issue26247 opened by Ismail s #26248: Improve scandir DirEntry docs, especially re symlinks and cach http://bugs.python.org/issue26248 opened by benhoyt #26249: Change PyMem_Malloc to use PyObject_Malloc allocator? http://bugs.python.org/issue26249 opened by haypo #26250: no document for sqlite3.Cursor.connection http://bugs.python.org/issue26250 opened by qinghao #26251: Use "Low-fragmentation Heap" memory allocator on Windows http://bugs.python.org/issue26251 opened by haypo #26252: Add an example to importlib docs on setting up an importer http://bugs.python.org/issue26252 opened by brett.cannon #26253: tarfile in stream mode always set zlib compression level to 9 http://bugs.python.org/issue26253 opened by Patrik Dufresne #26254: ssl should raise an exception when trying to load an unusable http://bugs.python.org/issue26254 opened by abacabadabacaba #26256: Fast decimalisation and conversion to other bases http://bugs.python.org/issue26256 opened by jneb #26257: Eliminate buffer_tests.py http://bugs.python.org/issue26257 opened by martin.panter #26258: readline module for python 3.x on windows http://bugs.python.org/issue26258 opened by Ali Razmjoo #26259: Memleak when repeated calls to asyncio.queue.Queue.get is perf http://bugs.python.org/issue26259 opened by Jonas Brunsgaard #26261: NamedTemporaryFile documentation is vague about the `name` att http://bugs.python.org/issue26261 opened by ztane #26262: Cannot compile with /fp:strict with MSVC http://bugs.python.org/issue26262 opened by zach.ware #26263: Serialize array.array to JSON by default http://bugs.python.org/issue26263 opened by Omer.Katz #26264: keyword module missing async and await keywords http://bugs.python.org/issue26264 opened by tuxtimo #26265: build errors on OS X 10.11 with --enable-universalsdk http://bugs.python.org/issue26265 opened by davidjamesbeck #26266: add classattribute to enum to handle non-Enum attributes http://bugs.python.org/issue26266 opened by ethan.furman #26267: UUID docs should say how to get "standard form" http://bugs.python.org/issue26267 opened by abarnert #26268: Update python.org installers to use OpenSSL 1.0.2f http://bugs.python.org/issue26268 opened by zach.ware #26269: zipfile should call lstat instead of stat if available http://bugs.python.org/issue26269 opened by Patrik Dufresne #26270: Support for read()/write()/select() on asyncio http://bugs.python.org/issue26270 opened by Paulo Costa #26271: freeze.py makefile uses the wrong flags variables http://bugs.python.org/issue26271 opened by Daniel Shaulov #26273: Expose TCP_CONGESTION and TCP_USER_TIMEOUT to the socket modul http://bugs.python.org/issue26273 opened by Omar Sandoval #26275: perf.py: calibrate benchmarks using time, not using a fixed nu http://bugs.python.org/issue26275 opened by haypo #26276: Inconsistent behaviour of PEP 3101 formatting between versions http://bugs.python.org/issue26276 opened by Mark Shannon #26277: Allow zipapp to target modules http://bugs.python.org/issue26277 opened by flying sheep #26278: BaseTransport.close() does not trigger connection_lost() http://bugs.python.org/issue26278 opened by Sümer.Cip #26279: time.strptime does not properly convert out-of-bounds values http://bugs.python.org/issue26279 opened by iaslan #26280: ceval: Optimize [] operation similarly to CPython 2.7 http://bugs.python.org/issue26280 opened by yselivanov #26281: Clear sys.path_importer_cache from importlib.invalidate_caches http://bugs.python.org/issue26281 opened by brett.cannon #26282: Add support for partial keyword arguments in extension functio http://bugs.python.org/issue26282 opened by serhiy.storchaka #26283: zipfile can not handle the path build by os.path.join() http://bugs.python.org/issue26283 opened by 張伯誠 #26284: FIx telco benchmark http://bugs.python.org/issue26284 opened by skrah #26285: Garbage collection of unused input sections from CPython binar http://bugs.python.org/issue26285 opened by alecsandru.patrascu #26286: dis module: coroutine opcode documentation clarity http://bugs.python.org/issue26286 opened by Jim.Jewett #26287: Core dump in f-string with formatting errors due to refcount b http://bugs.python.org/issue26287 opened by encukou #26288: Optimize PyLong_AsDouble for single-digit longs http://bugs.python.org/issue26288 opened by yselivanov #26289: Optimize floor division for ints http://bugs.python.org/issue26289 opened by yselivanov #26290: fileinput and 'for line in sys.stdin' do strange mockery of in http://bugs.python.org/issue26290 opened by Don Hatch #26292: Raw I/O writelines() broken http://bugs.python.org/issue26292 opened by haypo #26293: Embedded zipfile fields dependent on absolute position http://bugs.python.org/issue26293 opened by spoo #26294: Queue().unfinished_tasks not in docs - deliberate? http://bugs.python.org/issue26294 opened by frankmillman #26295: Random failures when running test suite in parallel (-m test - http://bugs.python.org/issue26295 opened by haypo #26296: colorys rgb_to_hls algorithm error http://bugs.python.org/issue26296 opened by Mats Luspa Most recent 15 issues with no replies (15) ========================================== #26294: Queue().unfinished_tasks not in docs - deliberate? http://bugs.python.org/issue26294 #26289: Optimize floor division for ints http://bugs.python.org/issue26289 #26288: Optimize PyLong_AsDouble for single-digit longs http://bugs.python.org/issue26288 #26286: dis module: coroutine opcode documentation clarity http://bugs.python.org/issue26286 #26284: FIx telco benchmark http://bugs.python.org/issue26284 #26283: zipfile can not handle the path build by os.path.join() http://bugs.python.org/issue26283 #26281: Clear sys.path_importer_cache from importlib.invalidate_caches http://bugs.python.org/issue26281 #26279: time.strptime does not properly convert out-of-bounds values http://bugs.python.org/issue26279 #26278: BaseTransport.close() does not trigger connection_lost() http://bugs.python.org/issue26278 #26277: Allow zipapp to target modules http://bugs.python.org/issue26277 #26273: Expose TCP_CONGESTION and TCP_USER_TIMEOUT to the socket modul http://bugs.python.org/issue26273 #26271: freeze.py makefile uses the wrong flags variables http://bugs.python.org/issue26271 #26269: zipfile should call lstat instead of stat if available http://bugs.python.org/issue26269 #26268: Update python.org installers to use OpenSSL 1.0.2f http://bugs.python.org/issue26268 #26266: add classattribute to enum to handle non-Enum attributes http://bugs.python.org/issue26266 Most recent 15 issues waiting for review (15) ============================================= #26289: Optimize floor division for ints http://bugs.python.org/issue26289 #26288: Optimize PyLong_AsDouble for single-digit longs http://bugs.python.org/issue26288 #26285: Garbage collection of unused input sections from CPython binar http://bugs.python.org/issue26285 #26280: ceval: Optimize [] operation similarly to CPython 2.7 http://bugs.python.org/issue26280 #26275: perf.py: calibrate benchmarks using time, not using a fixed nu http://bugs.python.org/issue26275 #26273: Expose TCP_CONGESTION and TCP_USER_TIMEOUT to the socket modul http://bugs.python.org/issue26273 #26271: freeze.py makefile uses the wrong flags variables http://bugs.python.org/issue26271 #26257: Eliminate buffer_tests.py http://bugs.python.org/issue26257 #26249: Change PyMem_Malloc to use PyObject_Malloc allocator? http://bugs.python.org/issue26249 #26248: Improve scandir DirEntry docs, especially re symlinks and cach http://bugs.python.org/issue26248 #26246: Code output toggle button uses removed jQuery method http://bugs.python.org/issue26246 #26243: zlib.compress level as keyword argument http://bugs.python.org/issue26243 #26228: pty.spawn hangs on FreeBSD 9.3, 10.x http://bugs.python.org/issue26228 #26224: Add "version added" for documentation of asyncio.timeout for d http://bugs.python.org/issue26224 #26219: implement per-opcode cache in ceval http://bugs.python.org/issue26219 Top 10 most discussed issues (10) ================================= #21955: ceval.c: implement fast path for integers with a single digit http://bugs.python.org/issue21955 56 msgs #26275: perf.py: calibrate benchmarks using time, not using a fixed nu http://bugs.python.org/issue26275 19 msgs #26249: Change PyMem_Malloc to use PyObject_Malloc allocator? http://bugs.python.org/issue26249 18 msgs #26280: ceval: Optimize [] operation similarly to CPython 2.7 http://bugs.python.org/issue26280 13 msgs #25660: tabs don't work correctly in python repl http://bugs.python.org/issue25660 10 msgs #26194: Undefined behavior for deque.insert() when len(d) == maxlen http://bugs.python.org/issue26194 10 msgs #26256: Fast decimalisation and conversion to other bases http://bugs.python.org/issue26256 9 msgs #25924: investigate if getaddrinfo(3) on OSX is thread-safe http://bugs.python.org/issue25924 8 msgs #26229: Make number serialization ES6/V8 compatible http://bugs.python.org/issue26229 8 msgs #26285: Garbage collection of unused input sections from CPython binar http://bugs.python.org/issue26285 8 msgs Issues closed (26) ================== #12923: test_urllib fails in refleak mode http://bugs.python.org/issue12923 closed by martin.panter #19587: Remove empty tests in test_bytes.FixedStringTest http://bugs.python.org/issue19587 closed by martin.panter #19883: Integer overflow in zipimport.c http://bugs.python.org/issue19883 closed by serhiy.storchaka #21328: Resize doesn't change reported length on create_string_buffer( http://bugs.python.org/issue21328 closed by Dustin.Oprea #22923: No prompt for "display all X possibilities" on completion-enab http://bugs.python.org/issue22923 closed by yoha #23076: list(pathlib.Path().glob("")) fails with IndexError http://bugs.python.org/issue23076 closed by berker.peksag #23601: use small object allocator for dict key storage http://bugs.python.org/issue23601 closed by rhettinger #25774: [benchmarks] Adjust to allow uploading benchmark data to codes http://bugs.python.org/issue25774 closed by zach.ware #25798: Update python.org installers to use OpenSSL 1.0.2e http://bugs.python.org/issue25798 closed by zach.ware #25934: ICC compiler: ICC treats denormal floating point numbers as 0. http://bugs.python.org/issue25934 closed by zach.ware #25945: Type confusion in partial_setstate and partial_call leads to m http://bugs.python.org/issue25945 closed by serhiy.storchaka #26125: Incorrect error message in the module asyncio.selector_events. http://bugs.python.org/issue26125 closed by berker.peksag #26173: test_ssl.bad_cert_test() exception handling http://bugs.python.org/issue26173 closed by martin.panter #26218: Set PrependPath default to true http://bugs.python.org/issue26218 closed by steve.dower #26222: Missing code in linux_distribution python 2.7.11 http://bugs.python.org/issue26222 closed by berker.peksag #26233: select.epoll.poll() should avoid calling malloc() each time http://bugs.python.org/issue26233 closed by haypo #26238: httplib use wrong hostname in https request with SNI support http://bugs.python.org/issue26238 closed by lvhancy #26241: repr() and str() are identical for floats in 3.5 http://bugs.python.org/issue26241 closed by mark.dickinson #26242: reST formatting error in Doc/library/importlib.rst http://bugs.python.org/issue26242 closed by berker.peksag #26244: zlib.compressobj level default value documentation http://bugs.python.org/issue26244 closed by martin.panter #26245: AttributeError (GL_READ_WRITE) when importing OpenGL.GL http://bugs.python.org/issue26245 closed by berker.peksag #26255: symtable.Symbol.is_referenced() returns false for valid use http://bugs.python.org/issue26255 closed by benjamin.peterson #26260: utf8 decoding inconsistency between P2 and P3 http://bugs.python.org/issue26260 closed by haypo #26272: `zipfile.ZipFile` fails reading a file object in specific vers http://bugs.python.org/issue26272 closed by Pengyu Chen #26274: Add CPU affinity to perf.py http://bugs.python.org/issue26274 closed by haypo #26291: Floating-point arithmetic http://bugs.python.org/issue26291 closed by ebarry

1 0

Opcode cache in ceval loop
by Yury Selivanov 05 Feb '16

05 Feb '16

Hi, This is the second email thread I start regarding implementing an opcode cache in ceval loop. Since my first post on this topic: - I've implemented another optimization (LOAD_ATTR); - I've added detailed statistics mode so that I can "see" how the cache performs and tune it; - some macro benchmarks are now 10-20% faster; 2to3 (a real application) is 7-8% faster; - and I have some good insights on the memory footprint. ** The purpose of this email is to get a general approval from python-dev, so that I can start polishing the patches and getting them reviewed/committed. ** Summary of optimizations ------------------------ When a code object is executed more than ~1000 times, it's considered "hot". It gets its opcodes analyzed to initialize caches for LOAD_METHOD (a new opcode I propose to add in [1]), LOAD_ATTR, and LOAD_GLOBAL. It's important to only optimize code objects that were executed "enough" times, to avoid optimizing code objects for modules, classes, and functions that were imported but never used. The cache struct is defined in code.h [2], and is 32 bytes long. When a code object becomes hot, it gets an cache offset table allocated for it (+1 byte for each opcode) + an array of cache structs. To measure the max/average memory impact, I tuned my code to optimize *every* code object on *first* run. Then I ran the entire Python test suite. Python test suite + standard library both contain around 72395 code objects, which required 20Mb of memory for caches. The test process consumed around 400Mb of memory. Thus, the absolute worst case scenario, the overhead is about 5%. Then I ran the test suite without any modifications to the patch. This means that only code objects that are called frequently enough are optimized. In this more, only 2072 code objects were optimized, using less than 1Mb of memory for the cache. LOAD_ATTR --------- Damien George mentioned that they optimize a lot of dict lookups in MicroPython by memorizing last key/value offset in the dict object, thus eliminating lots of hash lookups. I've implemented this optimization in my patch. The results are quite good. A simple micro-benchmark [3] shows ~30% speed improvement. Here are some debug stats generated by 2to3 benchmark: -- Opcode cache LOAD_ATTR hits = 14778415 (83%) -- Opcode cache LOAD_ATTR misses = 750 (0%) -- Opcode cache LOAD_ATTR opts = 282 -- Opcode cache LOAD_ATTR deopts = 60 -- Opcode cache LOAD_ATTR total = 17777912 Each "hit" makes LOAD_ATTR about 30% faster. LOAD_GLOBAL ----------- This turned out to be a very stable optimization. Here is the debug output of the 2to3 test: -- Opcode cache LOAD_GLOBAL hits = 3940647 (100%) -- Opcode cache LOAD_GLOBAL misses = 0 (0%) -- Opcode cache LOAD_GLOBAL opts = 252 All benchmarks (and real code) have stats like that. Globals and builtins are very rarely modified, so the cache works really well. With LOAD_GLOBAL opcode cache, global lookup is very cheap, there is no hash lookup for it at all. It makes optimizations like "def foo(len=len)" obsolete. LOAD_METHOD ----------- This is a new opcode I propose to add in [1]. The idea is to substitute LOAD_ATTR with it, and avoid instantiation of BoundMethod objects. With the cache, we can store a reference to the method descriptor (I use type->tp_version_tag for cache invalidation, the same thing _PyType_Lookup is built around). The cache makes LOAD_METHOD really efficient. A simple micro-benchmark like [4], shows that with the cache and LOAD_METHOD, "s.startswith('abc')" becomes as efficient as "s[:3] == 'abc'". LOAD_METHOD/CALL_FUNCTION without cache is about 20% faster than LOAD_ATTR/CALL_FUNCTION. With the cache, it's about 30% faster. Here's the debug output of the 2to3 benchmark: -- Opcode cache LOAD_METHOD hits = 5164848 (64%) -- Opcode cache LOAD_METHOD misses = 12 (0%) -- Opcode cache LOAD_METHOD opts = 94 -- Opcode cache LOAD_METHOD deopts = 12 -- Opcode cache LOAD_METHOD dct-chk= 1614801 -- Opcode cache LOAD_METHOD total = 7945954 What's next? ------------ First, I'd like to merge the new LOAD_METHOD opcode, see issue 26110 [1]. It's a very straightforward optimization, the patch is small and easy to review. Second, I'd like to merge the new opcode cache, see issue 26219 [5]. All unittests pass. Memory usage increase is very moderate (<1mb for the entire test suite), and the performance increase is significant. The only potential blocker for this is PEP 509 approval (which I'd be happy to assist with). What do you think? Thanks, Yury [1] http://bugs.python.org/issue26110 [2] https://github.com/1st1/cpython/blob/opcache5/Include/code.h#L10 [3] https://gist.github.com/1st1/37d928f1e84813bf1c44 [4] https://gist.github.com/1st1/10588e6e11c4d7c19445 [5] http://bugs.python.org/issue26219

11 36

Git for Mercurial Users
by Nikolaus Rath 03 Feb '16

03 Feb '16

Hello, With the upcoming move to Git, I thought people might be interested in some thoughts that I wrote down when learning Git for the first time as a long-time Mercurial user: http://www.rath.org/mercurial-for-git-users-and-vice-versa.html Comments are welcome (but probably more appropriate off-list). Best, -Nikolaus -- GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F »Time flies like an arrow, fruit flies like a Banana.«

2 1

Re: [Python-Dev] [Python-checkins] cpython: merge
by Martin Panter 02 Feb '16

02 Feb '16

On 2 February 2016 at 05:21, raymond.hettinger <python-checkins(a)python.org> wrote: > https://hg.python.org/cpython/rev/0731f097157b > changeset: 100142:0731f097157b > parent: 100140:c7f1acdd8be1 > user: Raymond Hettinger <python(a)rcn.com> > date: Mon Feb 01 21:21:19 2016 -0800 > summary: > merge > > files: > Doc/library/collections.rst | 4 ++-- > Lib/test/test_deque.py | 23 ++++++++++++----------- > Modules/_collectionsmodule.c | 7 ++----- > 3 files changed, 16 insertions(+), 18 deletions(-) This wasn’t actually a merge (there is only one parent). Hopefully I fixed it up with <https://hg.python.org/cpython/rev/03708c680eca>. But it looks like the original NEWS entry didn’t get merged in your earlier merge <https://hg.python.org/cpython/rev/58266f5101cc>, so there was nothing for me to merge the NEWS changes into in the default branch.

1 0