diff options
author | Guido van Rossum <guido@python.org> | 1998-01-12 18:57:53 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1998-01-12 18:57:53 +0000 |
commit | 092ba52579adabb2f3062e379f1264b5f89dac71 (patch) | |
tree | 75c2126638f5e8c1b348b0c724f28771a97152ae /Lib/re.py | |
parent | c2feb229d73ef63460e2fe3059cbcc85687a5483 (diff) | |
download | cpython-092ba52579adabb2f3062e379f1264b5f89dac71.tar.gz |
Fix two bugs:
(1) maxsplit was ignored in split().
(2) groups() would return a string instead of a singleton tuple when
there was only one group.
Diffstat (limited to 'Lib/re.py')
-rw-r--r-- | Lib/re.py | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -203,6 +203,7 @@ class RegexObject: if type(g)==type( "" ): g = [g] results[len(results):] = list(g) pos = lastmatch = j + n = n + 1 results.append(source[lastmatch:]) return results @@ -259,11 +260,13 @@ class MatchObject: def groups(self): "Return a tuple containing all subgroups of the match object" - - # If _num_regs==1, we don't want to call self.group with an - # empty tuple. - if self.re._num_regs == 1: return () - return apply(self.group, tuple(range(1, self.re._num_regs) ) ) + result = [] + for g in range(1, self.re._num_regs): + if (self.regs[g][0] == -1) or (self.regs[g][1] == -1): + result.append(None) + else: + result.append(self.string[self.regs[g][0]:self.regs[g][1]]) + return tuple(result) def group(self, *groups): "Return one or more groups of the match." |