diff options
author | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-16 06:50:13 +0000 |
---|---|---|
committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-16 06:50:13 +0000 |
commit | 10be10cbe72cc0cc0d05b2901f6857fdbb343894 (patch) | |
tree | 187aa5d7ae3a798239453331f1af23a14c6fce29 /Tools/scripts/methfix.py | |
parent | efbeaef1c1732ddb8d7d6d71847631094958bc89 (diff) | |
download | cpython-git-10be10cbe72cc0cc0d05b2901f6857fdbb343894.tar.gz |
Remove regsub, reconvert, regex, regex_syntax and everything under lib-old.
Diffstat (limited to 'Tools/scripts/methfix.py')
-rwxr-xr-x | Tools/scripts/methfix.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/scripts/methfix.py b/Tools/scripts/methfix.py index a872ab7395..b81871ff6a 100755 --- a/Tools/scripts/methfix.py +++ b/Tools/scripts/methfix.py @@ -27,7 +27,7 @@ # into a program for a different change to Python programs... import sys -import regex +import re import os from stat import * @@ -50,7 +50,7 @@ def main(): if fix(arg): bad = 1 sys.exit(bad) -ispythonprog = regex.compile('^[a-zA-Z0-9_]+\.py$') +ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$') def ispython(name): return ispythonprog.match(name) >= 0 @@ -101,7 +101,7 @@ def fix(filename): if lineno == 1 and g is None and line[:2] == '#!': # Check for non-Python scripts words = line[2:].split() - if words and regex.search('[pP]ython', words[0]) < 0: + if words and re.search('[pP]ython', words[0]) < 0: msg = filename + ': ' + words[0] msg = msg + ' script; not fixed\n' err(msg) @@ -158,8 +158,8 @@ def fix(filename): return 0 -fixpat = '^[ \t]+def +[a-zA-Z0-9_]+ *( *self *, *\(( *\(.*\) *)\) *) *:' -fixprog = regex.compile(fixpat) +fixpat = '^[ \t]+def +[a-zA-Z0-9_]+ *( *self *, *(( *(.*) *)) *) *:' +fixprog = re.compile(fixpat) def fixline(line): if fixprog.match(line) >= 0: |