Mailman 3 September 2013 - Python-Dev

SEEK_* constants in io and os
by Eli Bendersky Sept. 6, 2013

Sept. 6, 2013

Hello, I was looking at the possibility of replacing the SEEK_* constants by IntEnums, and the first thing that catches attention is that these constants are defined in both Lib/os.py and Lib/io.py; both places also recently started supporting SEEK_HOLE and SEEK_DATA (though here io refers to os.SEEK_HOLE and os.SEEK_DATA). Additional data points: other modules take these constants as arguments - * mmap: directs to use os.SEEK_* * chunk and fcntk: spell out the numeric values. os seems to … [View More]

4 9

windows file closing race condition?
by Chris Withers Sept. 6, 2013

Sept. 6, 2013

Hi All, Continuous testing is a wonderful thing when it comes to finding weird edge case problems, like this one: http://jenkins.simplistix.co.uk/job/testfixtures-tox/COMPONENTS=zc,PYTHON=3… File "C:\Jenkins\workspace\testfixtures-tox\e8666d4e\.tox\3.3-zc\lib\site-packages\testfixtures\tempdirectory.py", line 323, in __exit__ self.cleanup() File "C:\Jenkins\workspace\testfixtures-tox\e8666d4e\.tox\3.3-zc\lib\site-packages\testfixtures\tempdirectory.py", line 78, in cleanup … [View More]

8 14

Add a new tracemalloc module to trace memory allocations
by Victor Stinner Sept. 5, 2013

Sept. 5, 2013

Hi, Thanks to the PEP 445, it becomes possible to trace easily memory allocations. I propose to add a new tracemalloc module computing the memory usage per file and per line number. It has also a private method to retrieve the location (filename and line number) of a memory allocation of an object. tracemalloc is different than Heapy or PySizer because it is focused on the location of a memory allocation rather that the object type or object content. I have an implementation of the module … [View More]for Python 2.5-3.4, but it requires to patch and recompile Python: https://pypi.python.org/pypi/pytracemalloc My proposed implementation for Python 3.4 is different: * reuse the PEP 445 to hook memory allocators * use a simple C implementation of an hash table called "cfuhash" (coming from the libcfu project, BSD license) instead of depending on the glib library. I simplified and adapted cfuhash for my usage * no enable() / disable() function: tracemalloc can only be enabled before startup by setting PYTHONTRACEMALLOC=1 environment variable * traces (size of the memory block, Python filename, Python line number) are stored directly in the memory block, not in a separated hash table I chose PYTHONTRACEMALLOC env var instead of enable()/disable() functions to be able to really trace *all* memory allocated by Python, especially memory allocated at startup, during Python initialization. The (high-level) API should be reviewed and discussed. The most interesting part is to take "snapshots" and compare snapshots. The module can load snapshots from disk and compare them later for deeper analysis (ex: ignore some files). For the documentation, see the following page: https://pypi.python.org/pypi/pytracemalloc I created the following issue to track the implementation: http://bugs.python.org/issue18874 The implementation: http://hg.python.org/features/tracemalloc * * * I also created a "pyfailmalloc" project based on the PEP 445 to inject MemoryError exceptions. I used this module to check if Python handles correctly memory allocation failures. The answer is no, I fixed many bugs (see issue #18408). Project homepage: https://bitbucket.org/haypo/pyfailmalloc Charles-François Natali and Serhiy Storchaka asked me to add this module somewhere in Python 3.4: "how about adding pyfailmalloc to the main repo (maybe under Tools), with a script making it easy to run the tests suite with it enabled?" What is the best place for such module? Add it to Modules/ directory but as a private module: "_failmalloc"? * * * Example of tracemalloc output (it is more readable with colors, try in a terminal). The first top is sorted by total size, whereas the second top is sorted (automatically) with the size difference. You can see for example that the linecache module likes caching data (1.5 MB after 10 seconds of tests). $ PYTHONTRACEMALLOC=1 ./python -m test ... == CPython 3.4.0a1+ (default:2ce9e5f6b47c+, Aug 29 2013, 02:03:02) [GCC 4.7.2 20121109 (Red Hat 4.7.2-8)] == Linux-3.9.4-200.fc18.x86_64-x86_64-with-fedora-18-Spherical_Cow little-endian == /home/haypo/prog/python/tracemalloc/build/test_python_11087 ... [ 1/380] test_grammar [ 2/380] test_opcodes [ 3/380] test_dict [ 4/380] test_builtin [ 5/380] test_exceptions [ 6/380] test_types [ 7/380] test_unittest 2013-08-29 02:06:22: Top 25 allocations per file and line #1: <frozen importlib._bootstrap>:704: size=5 MiB, count=56227, average=105 B #2: .../tracemalloc/Lib/linecache.py:127: size=1004 KiB, count=8706, average=118 B #3: .../Lib/unittest/mock.py:1764: size=895 KiB, count=7841, average=116 B #4: .../Lib/unittest/mock.py:1805: size=817 KiB, count=15101, average=55 B #5: .../Lib/test/test_dict.py:35: size=768 KiB, count=8, average=96 KiB #6: <frozen importlib._bootstrap>:274: size=703 KiB, count=4604, average=156 B #7: ???:?: size=511 KiB, count=4445, average=117 B #8: .../Lib/unittest/mock.py:350: size=370 KiB, count=1227, average=308 B #9: .../Lib/unittest/case.py:306: size=343 KiB, count=1390, average=253 B #10: .../Lib/unittest/case.py:496: size=330 KiB, count=650, average=521 B #11: .../Lib/unittest/case.py:327: size=291 KiB, count=717, average=416 B #12: .../Lib/collections/__init__.py:368: size=239 KiB, count=2170, average=113 B #13: .../Lib/test/test_grammar.py:132: size=195 KiB, count=1250, average=159 B #14: .../Lib/unittest/mock.py:379: size=118 KiB, count=152, average=800 B #15: .../tracemalloc/Lib/contextlib.py:37: size=102 KiB, count=672, average=156 B #16: <frozen importlib._bootstrap>:1430: size=91 KiB, count=1193, average=78 B #17: .../tracemalloc/Lib/inspect.py:1399: size=79 KiB, count=104, average=784 B #18: .../tracemalloc/Lib/abc.py:133: size=77 KiB, count=275, average=289 B #19: .../Lib/unittest/case.py:43: size=73 KiB, count=593, average=127 B #20: .../Lib/unittest/mock.py:491: size=67 KiB, count=153, average=450 B #21: <frozen importlib._bootstrap>:1438: size=64 KiB, count=20, average=3321 B #22: .../Lib/unittest/case.py:535: size=56 KiB, count=76, average=766 B #23: .../tracemalloc/Lib/sre_compile.py:508: size=54 KiB, count=115, average=485 B #24: .../Lib/unittest/case.py:300: size=48 KiB, count=616, average=80 B #25: .../Lib/test/regrtest.py:1207: size=48 KiB, count=2, average=24 KiB 7333 more: size=4991 KiB, count=28051, average=182 B Total Python memory: size=17 MiB, count=136358, average=136 B Total process memory: size=42 MiB (ignore tracemalloc: 22 KiB) [ 8/380] test_doctest [ 9/380] test_doctest2 [ 10/380] test_support [ 11/380] test___all__ 2013-08-29 02:08:44: Top 25 allocations per file and line (compared to 2013-08-29 02:08:39) #1: <frozen importlib._bootstrap>:704: size=8 MiB (+2853 KiB), count=80879 (+24652), average=109 B #2: .../tracemalloc/Lib/linecache.py:127: size=1562 KiB (+557 KiB), count=13669 (+4964), average=117 B #3: <frozen importlib._bootstrap>:274: size=955 KiB (+252 KiB), count=6415 (+1811), average=152 B #4: .../Lib/collections/__init__.py:368: size=333 KiB (+93 KiB), count=3136 (+966), average=108 B #5: .../tracemalloc/Lib/abc.py:133: size=148 KiB (+71 KiB), count=483 (+211), average=314 B #6: .../Lib/urllib/parse.py:476: size=71 KiB (+71 KiB), count=969 (+969), average=75 B #7: .../tracemalloc/Lib/base64.py:143: size=59 KiB (+59 KiB), count=1025 (+1025), average=59 B #8: .../tracemalloc/Lib/doctest.py:1283: size=56 KiB (+56 KiB), count=507 (+507), average=113 B #9: .../tracemalloc/Lib/sre_compile.py:508: size=89 KiB (+36 KiB), count=199 (+86), average=460 B #10: <frozen importlib._bootstrap>:53: size=67 KiB (+32 KiB), count=505 (+242), average=136 B #11: <frozen importlib._bootstrap>:1048: size=61 KiB (+27 KiB), count=332 (+138), average=188 B #12: .../Lib/unittest/case.py:496: size=351 KiB (+25 KiB), count=688 (+48), average=522 B #13: .../tracemalloc/Lib/_weakrefset.py:38: size=55 KiB (+24 KiB), count=521 (+236), average=109 B #14: .../Lib/email/quoprimime.py:56: size=24 KiB (+24 KiB), count=190 (+190), average=132 B #15: .../Lib/email/quoprimime.py:57: size=24 KiB (+24 KiB), count=1 (+1) #16: .../test/support/__init__.py:1055: size=24 KiB (+24 KiB), count=1 (+1) #17: .../Lib/test/test___all__.py:48: size=23 KiB (+23 KiB), count=283 (+283), average=84 B #18: .../tracemalloc/Lib/_weakrefset.py:37: size=60 KiB (+22 KiB), count=438 (+174), average=140 B #19: .../tracemalloc/Lib/sre_parse.py:73: size=48 KiB (+20 KiB), count=263 (+114), average=189 B #20: <string>:5: size=61 KiB (+18 KiB), count=173 (+57), average=364 B #21: .../Lib/test/test___all__.py:34: size=16 KiB (+16 KiB), count=164 (+164), average=104 B #22: .../Lib/unittest/mock.py:491: size=79 KiB (+16 KiB), count=145 (+3), average=560 B #23: .../Lib/collections/__init__.py:362: size=50 KiB (+16 KiB), count=23 (+7), average=2255 B #24: .../Lib/test/test___all__.py:59: size=13 KiB (+13 KiB), count=165 (+165), average=84 B #25: .../tracemalloc/Lib/doctest.py:1291: size=13 KiB (+13 KiB), count=170 (+170), average=81 B 10788 more: size=7 MiB (-830 KiB), count=36291 (-16379), average=220 B Total Python memory: size=20 MiB (+3567 KiB), count=147635 (+20805), average=143 B Total process memory: size=49 MiB (+7 MiB) (ignore tracemalloc: 1669 KiB) Victor [View Less]

6 10

Completing the email6 API changes.
by R. David Murray Sept. 4, 2013

Sept. 4, 2013

If you've read my blog (eg: on planet python), you will be aware that I dedicated August to full time email package development. At the beginning of the month I worked out a design proposal for the remaining API additions to the email package, dealing with handling message bodies in a more natural way. I posted this to the email-sig, and got...well, no objections. Barry Warsaw did review it, and told me he had no issues with the overall design, but also had no time for a detailed review. … [View More]Since one way to see if a design holds together is to document and code it, I decided to go ahead and do so. This resulted in a number of small tweaks, but no major changes. I have at this point completed the coding. You can view the whole patch at: http://bugs.python.org/issue18891 which also links to three layered patches that I posted as I went along, if you prefer somewhat smaller patches. I think it would be great if I could check this in for alpha2. Since it is going in as an addition to the existing provisional code, the level of review required is not as high as for non-provisional code, I think. But I would certainly appreciate review from anyone so moved, since I haven't gotten any yet. Of course, if there is serious bikeshedding about the API, I won't make alpha2, but that's fine. The longer term goal, by the way, is to move all of this out of provisional status for 3.5. This code finishes the planned API additions for the email package to bring it fully into the world of Python3 and unicode. It does not "fix" the deep internals, which could be a future development direction (but probably only after the "old" API has been retired, which will take a while). But it does make it so that you can use the email package without having to be a MIME expert. (You can't get away with *no* MIME knowledge, but you no longer have to fuss with the details of the syntax.) To give you the flavor of how the entire new provisional API plays together, here's how you can build a complete message in your application: from email.message import MIMEMessage from email.headerregistry import Address fullmsg = MIMEMessage() fullmsg['To'] = Address('Foö Bar', 'fbar(a)example.com') fullmsg['From'] = "mè <me(a)example.com>" fullmsg['Subject'] = "j'ai un problème de python." fullmsg.set_content("et la il est monté sur moi et il commence" " a m'étouffer.") htmlmsg = MIMEMessage() htmlmsg.set_content("et la il est monté sur moi et il commence" " a m'étouffer.<img src='image1' />", subtype='html') with open('python.jpg', 'rb') as python: htmlmsg.add_related(python.read(), 'image', 'jpg', cid='image1' disposition='inline') fullmsg.make_alternative() fullmsg.attach(htmlmsg) with open('police-report.txt') as report: fullmsg.add_attachment(report.read(), filename='pölice-report.txt', params=dict(wrap='flow'), headers=( 'X-Secret-Level: top', 'X-Authorization: Monty')) Which results in: >>> for line in bytes(fullmsg).splitlines(): >>> print(line) b'To: =?utf-8?q?Fo=C3=B6?= Bar <fbar(a)example.com>' b'From: =?utf-8?q?m=C3=A8?= <me(a)example.com>' b"Subject: j'ai un =?utf-8?q?probl=C3=A8me?= de python." b'MIME-Version: 1.0' b'Content-Type: multipart/mixed; boundary="===============1710006838=="' b'' b'--===============1710006838==' b'Content-Type: multipart/alternative; boundary="===============1811969196=="' b'' b'--===============1811969196==' b'Content-Type: text/plain; charset="utf-8"' b'Content-Transfer-Encoding: 8bit' b'' b"et la il est mont\xc3\xa9 sur moi et il commence a m'\xc3\xa9touffer." b'' b'--===============1811969196==' b'MIME-Version: 1.0' b'Content-Type: multipart/related; boundary="===============1469657937=="' b'' b'--===============1469657937==' b'Content-Type: text/html; charset="utf-8"' b'Content-Transfer-Encoding: quoted-printable' b'' b"et la il est mont=C3=A9 sur moi et il commence a m'=C3=A9touffer.<img =" b"src=3D'image1' />" b'' b'--===============1469657937==' b'MIME-Version: 1.0' b'Content-Type: image/jpg' b'Content-Transfer-Encoding: base64' b'Content-Disposition: inline' b'Content-ID: image1' b'' b'ZmFrZSBpbWFnZSBkYXRhCg==' b'' b'--===============1469657937==--' b'--===============1811969196==--' b'--===============1710006838==' b'MIME-Version: 1.0' b'X-Secret-Level: top' b'X-Authorization: Monty' b'Content-Transfer-Encoding: 7bit' b'Content-Disposition: attachment; filename*=utf-8''p%C3%B6lice-report.txt" b'Content-Type: text/plain; charset="utf-8"; wrap="flow"' b'' b'il est sorti de son vivarium.' b'' b'--===============1710006838==--' If you've used the email package enough to be annoyed by it, you may notice that there are some nice things going on there, such as using CTE 8bit for the text part by default, and quoted-printable instead of base64 for utf8 when the lines are long enough to need wrapping. (Hmm. Looking at that I see I didn't fully fix a bug I had meant to fix: some of the parts have a MIME-Version header that don't need it.) All input strings are unicode, and the library takes care of doing whatever encoding is required. When you pull data out of a parsed message, you get unicode, without having to worry about how to decode it yourself. On the parsing side, after the above message has been parsed into a message object, we can do: >>> print(fullmsg['to'], fullmsg['from']) Foö Bar <"fbar(a)example.com"> mè <me(a)example.com> >>> print(fullmsg['subject']) j'ai un problème de python. >>> print(fullmsg['to'].addresses[0].display_name) Foö Bar >>> print(fullmsg.get_body(('plain',)).get_content()) et la il est monté sur moi et il commence a m'étouffer. >>> for part in fullmsg.get_body().iter_parts(): ... print(part.get_content()) et la il est monté sur moi et il commence a m'étouffer.<img src='image1' /> b'fake image data\n' >>> for attachment in fullmsg.iter_attachments(): ... print(attachment.get_content()) ... print(attachment['Content-Type'].params()) il est sorti de son vivarium. {'charset': 'utf-8', 'wrap': 'flow'} Of course, in a real program you'd actually be checking the mime types via get_content_type() and friends before getting the content and doing anything with it. Please read the new contentmanager module docs in the patch for full details of the content management part of the above API (and the headerregistry docs if you want to review the (new in 3.3) header parsing part of the above API). Feedback welcome, here or on the issue. --David PS: python jokes courtesy of someone doing a drive-by on #python-dev the other day. [View Less]

4 19

Python 2.6 to end support with 2.6.9 in October 2013
by Barry Warsaw Sept. 3, 2013

Sept. 3, 2013

Hello Pythonistas, Python 2.6.9 is the last planned release of the 2.6.x series. This will be a security-only source-only release. It is currently scheduled for October 2013, and after this Python 2.6 will have reached its end-of-life and the branch will be retired. http://www.python.org/dev/peps/pep-0361/ I would like to release 2.6.9rc1 on Monday, September 30th, and 2.6.9 final on Monday, October 28th. I've added both dates to the Python calendar. Here are the list of candidates still … [View More]

2 1

Re: [Python-Dev] [Python-checkins] cpython: Issue #11798: fix tests for regrtest -R :
by Eli Bendersky Sept. 2, 2013

Sept. 2, 2013

On Sat, Aug 31, 2013 at 9:58 PM, andrew.svetlov <python-checkins(a)python.org>wrote: > http://hg.python.org/cpython/rev/39781c3737f8 > changeset: 85490:39781c3737f8 > user: Andrew Svetlov <andrew.svetlov(a)gmail.com> > date: Sun Sep 01 07:58:41 2013 +0300 > summary: > Issue #11798: fix tests for regrtest -R : > > files: > Lib/test/regrtest.py | 5 +++++ > Lib/unittest/suite.py | 8 ++++++-- > Lib/unittest/… [View More]test/test_suite.py | 8 ++++++++ > 3 files changed, 19 insertions(+), 2 deletions(-) > > > Hi Andrew, It would help if you could add more details into the commit message. This would make both post-commit reviews and future code archeology simpler. Eli > diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py > --- a/Lib/test/regrtest.py > +++ b/Lib/test/regrtest.py > @@ -496,6 +496,8 @@ > > if ns.slaveargs is not None: > args, kwargs = json.loads(ns.slaveargs) > + if kwargs.get('huntrleaks'): > + unittest.BaseTestSuite._cleanup = False > try: > result = runtest(*args, **kwargs) > except KeyboardInterrupt: > @@ -528,6 +530,9 @@ > #gc.set_debug(gc.DEBUG_SAVEALL) > found_garbage = [] > > + if ns.huntrleaks: > + unittest.BaseTestSuite._cleanup = False > + > if ns.single: > filename = os.path.join(TEMPDIR, 'pynexttest') > try: > diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py > --- a/Lib/unittest/suite.py > +++ b/Lib/unittest/suite.py > @@ -16,6 +16,8 @@ > class BaseTestSuite(object): > """A simple test suite that doesn't provide class or module shared > fixtures. > """ > + _cleanup = True > + > def __init__(self, tests=()): > self._tests = [] > self.addTests(tests) > @@ -61,7 +63,8 @@ > if result.shouldStop: > break > test(result) > - self._removeTestAtIndex(index) > + if self._cleanup: > + self._removeTestAtIndex(index) > return result > > def _removeTestAtIndex(self, index): > @@ -115,7 +118,8 @@ > else: > test.debug() > > - self._removeTestAtIndex(index) > + if self._cleanup: > + self._removeTestAtIndex(index) > > if topLevel: > self._tearDownPreviousClass(None, result) > diff --git a/Lib/unittest/test/test_suite.py > b/Lib/unittest/test/test_suite.py > --- a/Lib/unittest/test/test_suite.py > +++ b/Lib/unittest/test/test_suite.py > @@ -303,6 +303,9 @@ > suite.run(unittest.TestResult()) > > def test_remove_test_at_index(self): > + if not unittest.BaseTestSuite._cleanup: > + raise unittest.SkipTest("Suite cleanup is disabled") > + > suite = unittest.TestSuite() > > suite._tests = [1, 2, 3] > @@ -311,6 +314,9 @@ > self.assertEqual([1, None, 3], suite._tests) > > def test_remove_test_at_index_not_indexable(self): > + if not unittest.BaseTestSuite._cleanup: > + raise unittest.SkipTest("Suite cleanup is disabled") > + > suite = unittest.TestSuite() > suite._tests = None > > @@ -318,6 +324,8 @@ > suite._removeTestAtIndex(2) > > def assert_garbage_collect_test_after_run(self, TestSuiteClass): > + if not unittest.BaseTestSuite._cleanup: > + raise unittest.SkipTest("Suite cleanup is disabled") > > class Foo(unittest.TestCase): > def test_nothing(self): > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins > > [View Less]

2 1

Re: [Python-Dev] cpython (merge 3.3 -> default): Merge fix from 3.3 into default.
by Antoine Pitrou Sept. 2, 2013

Sept. 2, 2013

On Sun, 1 Sep 2013 23:02:17 +0200 (CEST) tim.peters <python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/25211a22228b > changeset: 85495:25211a22228b > parent: 85493:267e09700978 > parent: 85494:8efcf3c823f9 > user: Tim Peters <tim(a)python.org> > date: Sun Sep 01 16:01:46 2013 -0500 > summary: > Merge fix from 3.3 into default. > > Fix issue 18889: test_sax: multiple failures on Windows desktop. > &… [View More]

3 2

Re: [Python-Dev] [Python-checkins] cpython: Update whatsnew/3.4.rst wrt. the socket constants switch to IntEnum
by Eli Bendersky Sept. 1, 2013

Sept. 1, 2013

On Sat, Aug 31, 2013 at 4:52 PM, Terry Reedy <tjreedy(a)udel.edu> wrote: > On 8/31/2013 6:19 PM, eli.bendersky wrote: > >> http://hg.python.org/cpython/**rev/4d604f1f0219<http://hg.python.org/cpython/rev/4d604f1f0219> >> changeset: 85482:4d604f1f0219 >> user: Eli Bendersky <eliben(a)gmail.com> >> date: Sat Aug 31 15:18:48 2013 -0700 >> summary: >> Update whatsnew/3.4.rst wrt. the socket constants switch to IntEnum &… [View More]

2 1

Re: [Python-Dev] [Python-checkins] cpython: Further reduce the cost of hash collisions by inspecting an additional nearby
by Eli Bendersky Sept. 1, 2013

Sept. 1, 2013

On Sat, Aug 31, 2013 at 9:29 PM, raymond.hettinger < python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/d40a65658ff0 > changeset: 85486:d40a65658ff0 > parent: 85482:4d604f1f0219 > user: Raymond Hettinger <python(a)rcn.com> > date: Sat Aug 31 21:27:08 2013 -0700 > summary: > Further reduce the cost of hash collisions by inspecting an additional > nearby entry. > Hi Raymond, I'm curious about the benchmarks … [View More]used to test such micro-optimizations. Do you use one of the existing Python benchmark suites or do you have a particular set of micro-benchmarks you're running this on? Eli > > files: > Objects/setobject.c | 43 +++++++++++++++++++++++++++++--- > 1 files changed, 39 insertions(+), 4 deletions(-) > > > diff --git a/Objects/setobject.c b/Objects/setobject.c > --- a/Objects/setobject.c > +++ b/Objects/setobject.c > @@ -65,10 +65,11 @@ > The initial probe index is computed as hash mod the table size. Subsequent > probe indices are computed as explained in Objects/dictobject.c. > > -To improve cache locality, each probe is done in pairs. > -After the probe is examined, an adjacent entry is then examined as well. > -The likelihood is that an adjacent entry is in the same cache line and > -can be examined more cheaply than another probe elsewhere in memory. > +To improve cache locality, each probe inspects nearby entries before > +moving on to probes elsewhere in memory. Depending on alignment and the > +size of a cache line, the nearby entries are cheaper to inspect than > +other probes elsewhere in memory. This probe strategy reduces the cost > +of hash collisions. > > All arithmetic on hash should ignore overflow. > > @@ -130,6 +131,26 @@ > if (entry->key == dummy && freeslot == NULL) > freeslot = entry; > > + entry = &table[j ^ 2]; > + if (entry->key == NULL) > + break; > + if (entry->key == key) > + return entry; > + if (entry->hash == hash && entry->key != dummy) { > + PyObject *startkey = entry->key; > + Py_INCREF(startkey); > + cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); > + Py_DECREF(startkey); > + if (cmp < 0) > + return NULL; > + if (table != so->table || entry->key != startkey) > + return set_lookkey(so, key, hash); > + if (cmp > 0) > + return entry; > + } > + if (entry->key == dummy && freeslot == NULL) > + freeslot = entry; > + > i = i * 5 + perturb + 1; > j = i & mask; > perturb >>= PERTURB_SHIFT; > @@ -190,6 +211,17 @@ > if (entry->key == dummy && freeslot == NULL) > freeslot = entry; > > + entry = &table[j ^ 2]; > + if (entry->key == NULL) > + break; > + if (entry->key == key > + || (entry->hash == hash > + && entry->key != dummy > + && unicode_eq(entry->key, key))) > + return entry; > + if (entry->key == dummy && freeslot == NULL) > + freeslot = entry; > + > i = i * 5 + perturb + 1; > j = i & mask; > perturb >>= PERTURB_SHIFT; > @@ -258,6 +290,9 @@ > entry = &table[j ^ 1]; > if (entry->key == NULL) > break; > + entry = &table[j ^ 2]; > + if (entry->key == NULL) > + break; > i = i * 5 + perturb + 1; > j = i & mask; > perturb >>= PERTURB_SHIFT; > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins > > [View Less]

1 0