]> granicus.if.org Git - python/commitdiff
Fix group() -- should be tuple even when re has exactly one group.
authorGuido van Rossum <guido@python.org>
Tue, 15 Jul 1997 15:40:29 +0000 (15:40 +0000)
committerGuido van Rossum <guido@python.org>
Tue, 15 Jul 1997 15:40:29 +0000 (15:40 +0000)
Lib/re.py

index e0d363f8a22ef1b47ec5ff01a17f143bfb97a264..2e1b9205f07dd27515e17c1cec456a7d4fc84962 100644 (file)
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -160,6 +160,9 @@ class MatchObject:
     def group(self, *groups):
        if len(groups) == 0:
            groups = range(1, self.re.num_regs)
+           use_all = 1
+       else:
+           use_all = 0
        result = []
        for g in groups:
            if type(g) == type(''):
@@ -171,7 +174,7 @@ class MatchObject:
                result.append(None)
            else:
                result.append(self.string[self.regs[g][0]:self.regs[g][1]])
-       if len(result) > 1:
+       if use_all or len(result) > 1:
            return tuple(result)
        elif len(result) == 1:
            return result[0]