From: Guido van Rossum <guido@python.org>
Date: Tue, 15 Jul 1997 15:40:29 +0000 (+0000)
Subject: Fix group() -- should be tuple even when re has exactly one group.
X-Git-Tag: v1.5a3~288
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=531097502cc549a8ec5bbe29c90e7b8850cbff24;p=thirdparty%2FPython%2Fcpython.git

Fix group() -- should be tuple even when re has exactly one group.
---

diff --git a/Lib/re.py b/Lib/re.py
index e0d363f8a22e..2e1b9205f07d 100644
--- 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]