diff options
author | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1994-08-01 11:34:53 (GMT) |
commit | b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af (patch) | |
tree | 9362939305b2d088b8f19a530c9015d886bc2801 /Lib/regexp.py | |
parent | 2979b01ff88ac4c5b316d9bf98edbaaaffac8e24 (diff) | |
download | cpython-b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af.zip cpython-b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af.tar.gz cpython-b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af.tar.bz2 |
Merge alpha100 branch back to main trunk
Diffstat (limited to 'Lib/regexp.py')
-rw-r--r-- | Lib/regexp.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Lib/regexp.py b/Lib/regexp.py index 6136814..4b5db73 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 |