From b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 1 Aug 1994 11:34:53 +0000 Subject: Merge alpha100 branch back to main trunk --- Lib/regexp.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Lib/regexp.py') diff --git a/Lib/regexp.py b/Lib/regexp.py index 613681488b..4b5db73e03 100644 --- a/Lib/regexp.py +++ b/Lib/regexp.py @@ -10,13 +10,7 @@ class Prog: self.prog = regex.compile(pat) finally: xxx = regex.set_syntax(save_syntax) - def match(self, *args): - if len(args) == 2: - str, offset = args - elif len(args) == 1: - str, offset = args[0], 0 - else: - raise TypeError, 'wrong argument count' + def match(self, str, offset = 0): if self.prog.search(str, offset) < 0: return () regs = self.prog.regs -- cgit v1.2.1