Mailman 3 November 2014 - Python-checkins

peps: Spelling fixes
by donald.stufft Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/peps/rev/1162102a0229 changeset: 5632:1162102a0229 user: Donald Stufft <donald(a)stufft.io> date: Sun Nov 30 18:17:40 2014 -0500 summary: Spelling fixes files: pep-0481.txt | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pep-0481.txt b/pep-0481.txt --- a/pep-0481.txt +++ b/pep-0481.txt @@ -50,7 +50,7 @@ them to peps(a)python.org. This process is unfriendly towards non-comitter contributors as well as cumbersome for comitters seeking to accept the patches sent by users. In contrast, the Pull Request workflow style enables non -techincal contributors, especially those who do not know their way around the +technical contributors, especially those who do not know their way around the DVCS of choice, to contribute using the web based editor. On the committer side, the Pull Requests enable them to tell, before merging, whether or not a particular Pull Request will break anything. It also enables them to do a @@ -66,7 +66,7 @@ -------- Looking at the variety of DVCS which are available today, it becomes fairly -clear that git has the largest mindshare. The Open Hub (Previously Ohloh) +clear that git has the largest mindshare. The Open Hub (previously Ohloh) statistics [#openhub-stats]_ show that currently 37% of the repositories indexed by Open Hub are using git which is second only to SVN (which has 48%), while Mercurial has just 2% of the indexed repositories (beating only bazaar @@ -88,8 +88,8 @@ In addition to simply making it more likely that any individual will already know how to use git, the number of projects and people using it means that the resources for learning the tool are likely to be more fully fleshed out. -When you run into problems, the liklihood that someone else had that problem -and posted a question and recieved an answer is also far likelier. +When you run into problems, the likelihood that someone else had that problem +and posted a question and recieved an answer is also far higher. Thirdly, by using a more popular tool you also increase your options for tooling *around* the DVCS itself. Looking at the various options for hosting @@ -99,7 +99,7 @@ Therefore the popularity of git increases the flexibility of our options going into the future for what toolchain these projects use. -Also, by moving to the more popular DVCS, we increase the likelhood that the +Also, by moving to the more popular DVCS, we increase the likelihood that the knowledge that the person has learned in contributing to these support repositories will transfer to projects outside of the immediate CPython project such as to the larger Python community which is primarily using Git hosted on @@ -108,7 +108,7 @@ In previous years there was concern about how well supported git was on Windows in comparison to Mercurial. However, git has grown to support Windows as a first class citizen. In addition to that, for Windows users who are not well -aquanted with the Windows command line, there are GUI options as well. +acquainted with the Windows command line, there are GUI options as well. Why Github? @@ -116,7 +116,7 @@ There are a number of software projects or web services which offer functionality similar to that of Github. These range from commerical web -services such as a Bitbucket to self-hosted OSS solutions such as Kallithea or +services such as Bitbucket to self-hosted OSS solutions such as Kallithea or Gitlab. This PEP proposes that we move these repositories to Github. There are two primary reasons for selecting Github: Popularity and @@ -124,7 +124,7 @@ Github is currently the most popular hosted repository hosting according to Alexa, where it currently has a global rank of 121. Much like for Git itself, -by choosing the most popular tool we gain benefits in increasing the likelhood +by choosing the most popular tool we gain benefits in increasing the likelihood that a new contributor will have already experienced the toolchain, the quality and availablity of the help, more and better tooling being built around it, and the knowledge transfer to other projects. A look again at the top 100 projects @@ -145,10 +145,10 @@ Finally, a reason to choose a web service at all over something that is self-hosted is to be able to more efficiently use volunteer time and donated -resources. Every additional service hosted on the PSF infrastruture by the +resources. Every additional service hosted on the PSF infrastructure by the PSF infrastructure team further spreads out the amount of time that the volunteers on that team have to spend and uses some chunk of resources that -could potentionally be used for something where there is no free or affordable +could potentially be used for something where there is no free or affordable hosted solution available. One concern that people do have with using a hosted service is that there is a @@ -178,7 +178,7 @@ sub-community without having to learn a special, bespoke workflow and a different toolchain for each project. They've found that when people can use their limited time on actually contributing instead of learning the different -tools and workflows that, not only do they contribute more to one project, but +tools and workflows, not only do they contribute more to one project, but that they also expand out and contribute to other projects. This move has also been attributed to the increased tendency for members of that community to go so far as publishing their research and educational materials on Github as @@ -195,7 +195,7 @@ Through the use of hg-git [#hg-git]_ we can easily convert a Mercurial repository to a Git repository by simply pushing the Mercurial repository to -the Git repository. People who wish to continue to use Mercurual locally can +the Git repository. People who wish to continue to use Mercurial locally can then use hg-git going into the future using the new Github URL. However they will need to re-clone their repositories as using Git as the server seems to trigger a one time change of the changeset ids. @@ -210,8 +210,8 @@ In addition to the migration of the repository hosting itself there are a number of locations for each particular repository which will require updating. -The bulk of these will simply be changing commands from the hg equivilant to -the git equivilant. +The bulk of these will simply be changing commands from the hg equivalent to +the git equivalent. In particular this will include: -- Repository URL: https://hg.python.org/peps

1 0

cpython: Issue #22902: The "ip" command is now used on Linux to determine MAC address
by serhiy.storchaka Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/cpython/rev/64bb01bce12c changeset: 93669:64bb01bce12c parent: 93666:f385bc6e6e09 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Nov 30 20:39:04 2014 +0200 summary: Issue #22902: The "ip" command is now used on Linux to determine MAC address in uuid.getnode(). Pach by Bruno Cauet. files: Lib/test/test_uuid.py | 6 ++++++ Lib/uuid.py | 11 +++++++++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -321,6 +321,12 @@ self.check_node(node, 'ifconfig') @unittest.skipUnless(os.name == 'posix', 'requires Posix') + def test_ip_getnode(self): + node = uuid._ip_getnode() + if node is not None: + self.check_node(node, 'ip') + + @unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_arp_getnode(self): node = uuid._arp_getnode() if node is not None: diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -356,6 +356,13 @@ if mac: return mac +def _ip_getnode(): + """Get the hardware address on Unix by running ip.""" + # This works on Linux with iproute2. + mac = _find_mac('ip', 'link list', [b'link/ether'], lambda i: i+1) + if mac: + return mac + def _arp_getnode(): """Get the hardware address on Unix by running arp.""" import os, socket @@ -538,8 +545,8 @@ if sys.platform == 'win32': getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode] else: - getters = [_unixdll_getnode, _ifconfig_getnode, _arp_getnode, - _lanscan_getnode, _netstat_getnode] + getters = [_unixdll_getnode, _ifconfig_getnode, _ip_getnode, + _arp_getnode, _lanscan_getnode, _netstat_getnode] for getter in getters + [_random_getnode]: try: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -217,6 +217,7 @@ Terry Carroll Edward Catmur Lorenzo M. Catucci +Bruno Cauet Donn Cave Charles Cazabon Jesús Cea Avión diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -191,6 +191,9 @@ Library ------- +- Issue #22902: The "ip" command is now used on Linux to determine MAC address + in uuid.getnode(). Pach by Bruno Cauet. + - Issue #22960: Add a context argument to xmlrpclib.ServerProxy constructor. - Issue #22389: Add contextlib.redirect_stderr(). -- Repository URL: https://hg.python.org/cpython

1 0

peps (merge default -> default): merge
by donald.stufft Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/peps/rev/baf5957cb698 changeset: 5631:baf5957cb698 parent: 5630:d31fe28e2766 parent: 5629:c9cd9f3cc044 user: Donald Stufft <donald(a)stufft.io> date: Sun Nov 30 12:27:25 2014 -0500 summary: merge files: pep-0008.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/pep-0008.txt b/pep-0008.txt --- a/pep-0008.txt +++ b/pep-0008.txt @@ -390,6 +390,19 @@ public and internal interfaces still apply. +String Quotes +============= + +In Python, single-quoted strings and double-quoted strings are the +same. This PEP do not make a recommendation for this. Pick a rule +and stick to it. When a string contains single or double quote +characters, however, use the other one to avoid backslashes in the +string. It improves readability. + +For triple-quoted strings, always use double quote characters to be +consistent with the docstring convention in PEP 257. + + Whitespace in Expressions and Statements ======================================== -- Repository URL: https://hg.python.org/peps

1 0

peps: Add a read-only mirror and remove the techincal arguments
by donald.stufft Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/peps/rev/d31fe28e2766 changeset: 5630:d31fe28e2766 parent: 5627:6c6947dbd13f user: Donald Stufft <donald(a)stufft.io> date: Sun Nov 30 12:27:06 2014 -0500 summary: Add a read-only mirror and remove the techincal arguments files: pep-0481.txt | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/pep-0481.txt b/pep-0481.txt --- a/pep-0481.txt +++ b/pep-0481.txt @@ -110,21 +110,6 @@ first class citizen. In addition to that, for Windows users who are not well aquanted with the Windows command line, there are GUI options as well. -On a techincal level git and Mercurial are fairly similar, however the git -branching model is signifcantly better than Mercurial "Named Branches" for -non-comitter contributors. Mercurial does have a "Bookmarks" extension, however -this isn't quite as good as git's branching model. All bookmarks live in the -same namespace so it requires individual users to ensure that they namespace -the branchnames themselves lest the risk collision. It also is an extension -which requires new users to first discover they need an extension at all, and -then figure out what they need to do in order to enable that extension. Since, -in contrast to the branching feature in git, this feature is a Mercurial -extension, in general, its support outside the Mercurial core is less -extensive. Finally, users who are not used to Mercurial are unlikely to -discover bookmarks on their own, instead they will likely attempt to use -Mercurial's "Named Branches" which, given the fact they live "forever", are not -often what a project wants their contributors to use. - Why Github? ----------- @@ -240,6 +225,9 @@ each push. * Migrate any issues for these projects to their respective bug tracker on Github. +* Use hg-git to provide a read-only mirror on hg.python.org which will enable + read-only uses of the hg.python.org instances of the specified repositories + to remain the same. This will restore these repositories to similar functionality as they currently have. In addition to this the migration will also include enabling testing for -- Repository URL: https://hg.python.org/peps

1 0

cpython (merge 3.4 -> default): merge 3.4 (#9179)
by benjamin.peterson Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/cpython/rev/f385bc6e6e09 changeset: 93666:f385bc6e6e09 parent: 93664:13e286c718cb parent: 93665:d1f7c3f45ffe user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 30 11:51:16 2014 -0500 summary: merge 3.4 (#9179) files: Lib/re.py | 5 +-- Lib/sre_parse.py | 33 +++++++-------------------- Lib/test/test_re.py | 38 +-------------------------------- Misc/NEWS | 3 -- 4 files changed, 12 insertions(+), 67 deletions(-) diff --git a/Lib/re.py b/Lib/re.py --- a/Lib/re.py +++ b/Lib/re.py @@ -351,11 +351,10 @@ s = sre_parse.Pattern() s.flags = flags for phrase, action in lexicon: - gid = s.opengroup() p.append(sre_parse.SubPattern(s, [ - (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))), ])) - s.closegroup(gid, p[-1]) + s.groups = len(p)+1 p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) self.scanner = sre_compile.compile(p) def scan(self, string): diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -68,14 +68,12 @@ # master pattern object. keeps track of global attributes def __init__(self): self.flags = 0 + self.open = [] + self.groups = 1 self.groupdict = {} - self.subpatterns = [None] # group 0 - @property - def groups(self): - return len(self.subpatterns) def opengroup(self, name=None): gid = self.groups - self.subpatterns.append(None) + self.groups = gid + 1 if self.groups > MAXGROUPS: raise error("groups number is too large") if name is not None: @@ -84,11 +82,12 @@ raise error("redefinition of group name %r as group %d; " "was group %d" % (name, gid, ogid)) self.groupdict[name] = gid + self.open.append(gid) return gid - def closegroup(self, gid, p): - self.subpatterns[gid] = p + def closegroup(self, gid): + self.open.remove(gid) def checkgroup(self, gid): - return gid < self.groups and self.subpatterns[gid] is not None + return gid < self.groups and gid not in self.open class SubPattern: # a subpattern, in intermediate form @@ -184,21 +183,7 @@ elif op in _UNITCODES: lo = lo + 1 hi = hi + 1 - elif op is GROUPREF: - i, j = self.pattern.subpatterns[av].getwidth() - lo = lo + i - hi = hi + j - elif op is GROUPREF_EXISTS: - i, j = av[1].getwidth() - if av[2] is not None: - l, h = av[2].getwidth() - i = min(i, l) - j = max(j, h) - else: - i = 0 - lo = lo + i - hi = hi + j - elif op is SUCCESS: + elif op == SUCCESS: break self.width = min(lo, MAXREPEAT - 1), min(hi, MAXREPEAT) return self.width @@ -741,7 +726,7 @@ if not sourcematch(")"): raise source.error("unbalanced parenthesis") if group is not None: - state.closegroup(group, p) + state.closegroup(group) subpatternappend((SUBPATTERN, (group, p))) else: while True: diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -589,7 +589,7 @@ self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0), "a\n\nb") - def test_lookahead(self): + def test_non_consuming(self): self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") @@ -603,42 +603,6 @@ self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a") self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a") - # Group reference. - self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba')) - self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac')) - # Conditional group reference. - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(2)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(1)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(1)c|x))c', 'abc')) - # Group used before defined. - self.assertTrue(re.match('(a)b(?=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?=(?(2)b|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?=(?(1)c|x))(c)', 'abc')) - - def test_lookbehind(self): - self.assertTrue(re.match('ab(?<=b)c', 'abc')) - self.assertIsNone(re.match('ab(?<=c)c', 'abc')) - self.assertIsNone(re.match('ab(?<!b)c', 'abc')) - self.assertTrue(re.match('ab(?<!c)c', 'abc')) - # Group reference. - self.assertTrue(re.match(r'(a)a(?<=\1)c', 'aac')) - self.assertIsNone(re.match(r'(a)b(?<=\1)a', 'abaa')) - self.assertIsNone(re.match(r'(a)a(?<!\1)c', 'aac')) - self.assertTrue(re.match(r'(a)b(?<!\1)a', 'abaa')) - # Conditional group reference. - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(2)x|b))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(1)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(1)b|x))c', 'abc')) - # Group used before defined. - self.assertIsNone(re.match('(a)b(?<=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(2)b|x))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(1)c|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?<=(?(1)b|x))(c)', 'abc')) - def test_ignore_case(self): self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC") self.assertEqual(re.match(b"abc", b"ABC", re.I).group(0), b"ABC") diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -240,9 +240,6 @@ - Issue #21650: Add an `--sort-keys` option to json.tool CLI. -- Issues #814253, #9179: Group references and conditional group references now - work in lookbehind assertions in regular expressions. - - Issue #22824: Updated reprlib output format for sets to use set literals. Patch contributed by Berker Peksag. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge 2.7.9 release branch
by benjamin.peterson Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/cpython/rev/961145c548e2 changeset: 93668:961145c548e2 branch: 2.7 parent: 93660:24f86799e9d3 parent: 93667:8a3807e15a1f user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 30 11:51:48 2014 -0500 summary: merge 2.7.9 release branch files: Lib/re.py | 5 +-- Lib/sre_parse.py | 33 +++++++-------------------- Lib/test/test_re.py | 38 +-------------------------------- Misc/NEWS | 3 -- 4 files changed, 12 insertions(+), 67 deletions(-) diff --git a/Lib/re.py b/Lib/re.py --- a/Lib/re.py +++ b/Lib/re.py @@ -312,11 +312,10 @@ s = sre_parse.Pattern() s.flags = flags for phrase, action in lexicon: - gid = s.opengroup() p.append(sre_parse.SubPattern(s, [ - (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))), ])) - s.closegroup(gid, p[-1]) + s.groups = len(p)+1 p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) self.scanner = sre_compile.compile(p) def scan(self, string): diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -66,25 +66,24 @@ # master pattern object. keeps track of global attributes def __init__(self): self.flags = 0 + self.open = [] + self.groups = 1 self.groupdict = {} - self.subpatterns = [None] # group 0 - @property - def groups(self): - return len(self.subpatterns) def opengroup(self, name=None): gid = self.groups - self.subpatterns.append(None) + self.groups = gid + 1 if name is not None: ogid = self.groupdict.get(name, None) if ogid is not None: raise error, ("redefinition of group name %s as group %d; " "was group %d" % (repr(name), gid, ogid)) self.groupdict[name] = gid + self.open.append(gid) return gid - def closegroup(self, gid, p): - self.subpatterns[gid] = p + def closegroup(self, gid): + self.open.remove(gid) def checkgroup(self, gid): - return gid < self.groups and self.subpatterns[gid] is not None + return gid < self.groups and gid not in self.open class SubPattern: # a subpattern, in intermediate form @@ -179,21 +178,7 @@ elif op in UNITCODES: lo = lo + 1 hi = hi + 1 - elif op is GROUPREF: - i, j = self.pattern.subpatterns[av].getwidth() - lo = lo + i - hi = hi + j - elif op is GROUPREF_EXISTS: - i, j = av[1].getwidth() - if av[2] is not None: - l, h = av[2].getwidth() - i = min(i, l) - j = max(j, h) - else: - i = 0 - lo = lo + i - hi = hi + j - elif op is SUCCESS: + elif op == SUCCESS: break self.width = min(lo, MAXREPEAT - 1), min(hi, MAXREPEAT) return self.width @@ -672,7 +657,7 @@ if not sourcematch(")"): raise error, "unbalanced parenthesis" if group is not None: - state.closegroup(group, p) + state.closegroup(group) subpatternappend((SUBPATTERN, (group, p))) else: while 1: diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -449,7 +449,7 @@ self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0), "a\n\nb") - def test_lookahead(self): + def test_non_consuming(self): self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") @@ -463,42 +463,6 @@ self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a") self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a") - # Group reference. - self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba')) - self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac')) - # Conditional group reference. - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(2)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(1)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(1)c|x))c', 'abc')) - # Group used before defined. - self.assertTrue(re.match('(a)b(?=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?=(?(2)b|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?=(?(1)c|x))(c)', 'abc')) - - def test_lookbehind(self): - self.assertTrue(re.match('ab(?<=b)c', 'abc')) - self.assertIsNone(re.match('ab(?<=c)c', 'abc')) - self.assertIsNone(re.match('ab(?<!b)c', 'abc')) - self.assertTrue(re.match('ab(?<!c)c', 'abc')) - # Group reference. - self.assertTrue(re.match(r'(a)a(?<=\1)c', 'aac')) - self.assertIsNone(re.match(r'(a)b(?<=\1)a', 'abaa')) - self.assertIsNone(re.match(r'(a)a(?<!\1)c', 'aac')) - self.assertTrue(re.match(r'(a)b(?<!\1)a', 'abaa')) - # Conditional group reference. - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(2)x|b))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(1)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(1)b|x))c', 'abc')) - # Group used before defined. - self.assertIsNone(re.match('(a)b(?<=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(2)b|x))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(1)c|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?<=(?(1)b|x))(c)', 'abc')) - def test_ignore_case(self): self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC") self.assertEqual(re.match("abc", u"ABC", re.I).group(0), "ABC") diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -101,9 +101,6 @@ - Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian platforms. -- Issues #814253, #9179: Group references and conditional group references now - work in lookbehind assertions in regular expressions. - - Issue #17293: uuid.getnode() now determines MAC address on AIX using netstat. Based on patch by Aivars Kalvāns. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): backout fac649bf2d10 (#9179) for further consideration
by benjamin.peterson Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/cpython/rev/8a3807e15a1f changeset: 93667:8a3807e15a1f branch: 2.7 parent: 93659:fee117d5c894 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 30 11:47:54 2014 -0500 summary: backout fac649bf2d10 (#9179) for further consideration files: Lib/re.py | 5 +-- Lib/sre_parse.py | 33 +++++++-------------------- Lib/test/test_re.py | 38 +-------------------------------- Misc/NEWS | 3 -- 4 files changed, 12 insertions(+), 67 deletions(-) diff --git a/Lib/re.py b/Lib/re.py --- a/Lib/re.py +++ b/Lib/re.py @@ -312,11 +312,10 @@ s = sre_parse.Pattern() s.flags = flags for phrase, action in lexicon: - gid = s.opengroup() p.append(sre_parse.SubPattern(s, [ - (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))), ])) - s.closegroup(gid, p[-1]) + s.groups = len(p)+1 p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) self.scanner = sre_compile.compile(p) def scan(self, string): diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -66,25 +66,24 @@ # master pattern object. keeps track of global attributes def __init__(self): self.flags = 0 + self.open = [] + self.groups = 1 self.groupdict = {} - self.subpatterns = [None] # group 0 - @property - def groups(self): - return len(self.subpatterns) def opengroup(self, name=None): gid = self.groups - self.subpatterns.append(None) + self.groups = gid + 1 if name is not None: ogid = self.groupdict.get(name, None) if ogid is not None: raise error, ("redefinition of group name %s as group %d; " "was group %d" % (repr(name), gid, ogid)) self.groupdict[name] = gid + self.open.append(gid) return gid - def closegroup(self, gid, p): - self.subpatterns[gid] = p + def closegroup(self, gid): + self.open.remove(gid) def checkgroup(self, gid): - return gid < self.groups and self.subpatterns[gid] is not None + return gid < self.groups and gid not in self.open class SubPattern: # a subpattern, in intermediate form @@ -179,21 +178,7 @@ elif op in UNITCODES: lo = lo + 1 hi = hi + 1 - elif op is GROUPREF: - i, j = self.pattern.subpatterns[av].getwidth() - lo = lo + i - hi = hi + j - elif op is GROUPREF_EXISTS: - i, j = av[1].getwidth() - if av[2] is not None: - l, h = av[2].getwidth() - i = min(i, l) - j = max(j, h) - else: - i = 0 - lo = lo + i - hi = hi + j - elif op is SUCCESS: + elif op == SUCCESS: break self.width = min(lo, MAXREPEAT - 1), min(hi, MAXREPEAT) return self.width @@ -672,7 +657,7 @@ if not sourcematch(")"): raise error, "unbalanced parenthesis" if group is not None: - state.closegroup(group, p) + state.closegroup(group) subpatternappend((SUBPATTERN, (group, p))) else: while 1: diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -449,7 +449,7 @@ self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0), "a\n\nb") - def test_lookahead(self): + def test_non_consuming(self): self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") @@ -463,42 +463,6 @@ self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a") self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a") - # Group reference. - self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba')) - self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac')) - # Conditional group reference. - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(2)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(1)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(1)c|x))c', 'abc')) - # Group used before defined. - self.assertTrue(re.match('(a)b(?=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?=(?(2)b|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?=(?(1)c|x))(c)', 'abc')) - - def test_lookbehind(self): - self.assertTrue(re.match('ab(?<=b)c', 'abc')) - self.assertIsNone(re.match('ab(?<=c)c', 'abc')) - self.assertIsNone(re.match('ab(?<!b)c', 'abc')) - self.assertTrue(re.match('ab(?<!c)c', 'abc')) - # Group reference. - self.assertTrue(re.match(r'(a)a(?<=\1)c', 'aac')) - self.assertIsNone(re.match(r'(a)b(?<=\1)a', 'abaa')) - self.assertIsNone(re.match(r'(a)a(?<!\1)c', 'aac')) - self.assertTrue(re.match(r'(a)b(?<!\1)a', 'abaa')) - # Conditional group reference. - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(2)x|b))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(1)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(1)b|x))c', 'abc')) - # Group used before defined. - self.assertIsNone(re.match('(a)b(?<=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(2)b|x))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(1)c|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?<=(?(1)b|x))(c)', 'abc')) - def test_ignore_case(self): self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC") self.assertEqual(re.match("abc", u"ABC", re.I).group(0), "ABC") diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -72,9 +72,6 @@ - Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian platforms. -- Issues #814253, #9179: Group references and conditional group references now - work in lookbehind assertions in regular expressions. - - Issue #17293: uuid.getnode() now determines MAC address on AIX using netstat. Based on patch by Aivars Kalvāns. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): backout 9fcf4008b626 (#9179) for further consideration
by benjamin.peterson Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/cpython/rev/d1f7c3f45ffe changeset: 93665:d1f7c3f45ffe branch: 3.4 parent: 93663:086a21998db2 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Nov 30 11:49:00 2014 -0500 summary: backout 9fcf4008b626 (#9179) for further consideration files: Lib/re.py | 5 +-- Lib/sre_parse.py | 33 +++++++-------------------- Lib/test/test_re.py | 38 +-------------------------------- Misc/NEWS | 3 -- 4 files changed, 12 insertions(+), 67 deletions(-) diff --git a/Lib/re.py b/Lib/re.py --- a/Lib/re.py +++ b/Lib/re.py @@ -352,11 +352,10 @@ s = sre_parse.Pattern() s.flags = flags for phrase, action in lexicon: - gid = s.opengroup() p.append(sre_parse.SubPattern(s, [ - (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))), ])) - s.closegroup(gid, p[-1]) + s.groups = len(p)+1 p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) self.scanner = sre_compile.compile(p) def scan(self, string): diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -66,25 +66,24 @@ # master pattern object. keeps track of global attributes def __init__(self): self.flags = 0 + self.open = [] + self.groups = 1 self.groupdict = {} - self.subpatterns = [None] # group 0 - @property - def groups(self): - return len(self.subpatterns) def opengroup(self, name=None): gid = self.groups - self.subpatterns.append(None) + self.groups = gid + 1 if name is not None: ogid = self.groupdict.get(name, None) if ogid is not None: raise error("redefinition of group name %s as group %d; " "was group %d" % (repr(name), gid, ogid)) self.groupdict[name] = gid + self.open.append(gid) return gid - def closegroup(self, gid, p): - self.subpatterns[gid] = p + def closegroup(self, gid): + self.open.remove(gid) def checkgroup(self, gid): - return gid < self.groups and self.subpatterns[gid] is not None + return gid < self.groups and gid not in self.open class SubPattern: # a subpattern, in intermediate form @@ -182,21 +181,7 @@ elif op in UNITCODES: lo = lo + 1 hi = hi + 1 - elif op is GROUPREF: - i, j = self.pattern.subpatterns[av].getwidth() - lo = lo + i - hi = hi + j - elif op is GROUPREF_EXISTS: - i, j = av[1].getwidth() - if av[2] is not None: - l, h = av[2].getwidth() - i = min(i, l) - j = max(j, h) - else: - i = 0 - lo = lo + i - hi = hi + j - elif op is SUCCESS: + elif op == SUCCESS: break self.width = min(lo, MAXREPEAT - 1), min(hi, MAXREPEAT) return self.width @@ -724,7 +709,7 @@ if not sourcematch(")"): raise error("unbalanced parenthesis") if group is not None: - state.closegroup(group, p) + state.closegroup(group) subpatternappend((SUBPATTERN, (group, p))) else: while 1: diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -557,7 +557,7 @@ self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0), "a\n\nb") - def test_lookahead(self): + def test_non_consuming(self): self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") @@ -571,42 +571,6 @@ self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a") self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a") - # Group reference. - self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba')) - self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac')) - # Conditional group reference. - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(2)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(1)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?=(?(1)c|x))c', 'abc')) - # Group used before defined. - self.assertTrue(re.match('(a)b(?=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?=(?(2)b|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?=(?(1)c|x))(c)', 'abc')) - - def test_lookbehind(self): - self.assertTrue(re.match('ab(?<=b)c', 'abc')) - self.assertIsNone(re.match('ab(?<=c)c', 'abc')) - self.assertIsNone(re.match('ab(?<!b)c', 'abc')) - self.assertTrue(re.match('ab(?<!c)c', 'abc')) - # Group reference. - self.assertTrue(re.match(r'(a)a(?<=\1)c', 'aac')) - self.assertIsNone(re.match(r'(a)b(?<=\1)a', 'abaa')) - self.assertIsNone(re.match(r'(a)a(?<!\1)c', 'aac')) - self.assertTrue(re.match(r'(a)b(?<!\1)a', 'abaa')) - # Conditional group reference. - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)x|c))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(2)b|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(2)x|b))c', 'abc')) - self.assertIsNone(re.match('(?:(a)|(x))b(?<=(?(1)c|x))c', 'abc')) - self.assertTrue(re.match('(?:(a)|(x))b(?<=(?(1)b|x))c', 'abc')) - # Group used before defined. - self.assertIsNone(re.match('(a)b(?<=(?(2)x|c))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(2)b|x))(c)', 'abc')) - self.assertIsNone(re.match('(a)b(?<=(?(1)c|x))(c)', 'abc')) - self.assertTrue(re.match('(a)b(?<=(?(1)b|x))(c)', 'abc')) - def test_ignore_case(self): self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC") self.assertEqual(re.match(b"abc", b"ABC", re.I).group(0), b"ABC") diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -68,9 +68,6 @@ - Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian platforms. -- Issues #814253, #9179: Group references and conditional group references now - work in lookbehind assertions in regular expressions. - - Issue #22406: Fixed the uu_codec codec incorrectly ported to 3.x. Based on patch by Martin Panter. -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (4990157343c6): sum=1
by solipsis＠pitrou.net Nov. 30, 2014

Nov. 30, 2014

results for 4990157343c6 on branch "default" -------------------------------------------- test_collections leaked [-2, 0, 0] references, sum=-2 test_functools leaked [0, 0, 3] memory blocks, sum=3 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog2KIkcS', '-x']

1 0

cpython (merge 3.4 -> default): merge 3.4
by benjamin.peterson Nov. 30, 2014

Nov. 30, 2014

https://hg.python.org/cpython/rev/13e286c718cb changeset: 93664:13e286c718cb parent: 93662:2a126ce6f83e parent: 93663:086a21998db2 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Nov 29 23:38:23 2014 -0500 summary: merge 3.4 files: Doc/library/xmlrpc.client.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst --- a/Doc/library/xmlrpc.client.rst +++ b/Doc/library/xmlrpc.client.rst @@ -34,7 +34,7 @@ .. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \ allow_none=False, use_datetime=False, \ - use_builtin_types=False, context=None) + use_builtin_types=False, *, context=None) .. versionchanged:: 3.3 The *use_builtin_types* flag was added. -- Repository URL: https://hg.python.org/cpython

1 0