Skip to content

Commit 9694fca

Browse files
gvanrossumgvanrossum
committed
Convert all remaining *simple* cases of regex usage to re usage.
1 parent 426916e commit 9694fca

File tree

23 files changed

+134
-144
lines changed

23 files changed

+134
-144
lines changed

‎Lib/fmt.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,9 @@ def invert(self, d, region):
461461
self.paralist[para2].invert(d, pos1, pos2)
462462
#
463463
def search(self, prog):
464-
import regex, string
464+
import re, string
465465
if type(prog) == type(''):
466-
prog = regex.compile(string.lower(prog))
466+
prog = re.compile(string.lower(prog))
467467
if self.selection:
468468
iold = self.selection[0][0]
469469
else:
@@ -474,8 +474,9 @@ def search(self, prog):
474474
continue
475475
p = self.paralist[i]
476476
text = string.lower(p.extract())
477-
if prog.search(text) >= 0:
478-
a, b = prog.regs[0]
477+
match = prog.search(text)
478+
if match:
479+
a, b = match.group(0)
479480
long1 = i, a
480481
long2 = i, b
481482
hit = long1, long2

‎Lib/fnmatch.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
corresponding to PATTERN. (It does not compile it.)
1111
"""
1212

13+
import re
14+
1315
_cache = {}
1416

1517
def fnmatch(name, pat):
@@ -42,11 +44,8 @@ def fnmatchcase(name, pat):
4244

4345
if not _cache.has_key(pat):
4446
res = translate(pat)
45-
import regex
46-
save_syntax = regex.set_syntax(0)
47-
_cache[pat] = regex.compile(res)
48-
save_syntax = regex.set_syntax(save_syntax)
49-
return _cache[pat].match(name) == len(name)
47+
_cache[pat] = re.compile(res)
48+
return _cache[pat].match(name) is not None
5049

5150
def translate(pat):
5251
"""Translate a shell PATTERN to a regular expression.
@@ -85,8 +84,6 @@ def translate(pat):
8584
stuff = stuff[1:] + stuff[0]
8685
stuff = '[' + stuff + ']'
8786
res = res + stuff
88-
elif c in '\\.+^$':
89-
res = res + ('\\' + c)
9087
else:
91-
res = res + c
92-
return res
88+
res = res + re.escape(c)
89+
return res + "$"

‎Lib/fpformat.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
# digits_behind: number of digits behind the decimal point
1212

1313

14-
import regex
14+
import re
1515

1616
# Compiled regular expression to "decode" a number
17-
decoder = regex.compile( \
18-
'^\([-+]?\)0*\([0-9]*\)\(\(\.[0-9]*\)?\)\(\([eE][-+]?[0-9]+\)?\)$')
17+
decoder = re.compile( \
18+
'^([-+]?)0*([0-9]*)((\.[0-9]*)?)(([eE][-+]?[0-9]+)?)$')
1919
# \0 the whole thing
2020
# \1 leading sign or empty
2121
# \2 digits left of decimal point
@@ -30,10 +30,9 @@
3030
# fraction is 0 or more digits
3131
# expo is an integer
3232
def extract(s):
33-
if decoder.match(s) < 0: raise NotANumber
34-
(a1, b1), (a2, b2), (a3, b3), (a4, b4), (a5, b5) = decoder.regs[1:6]
35-
sign, intpart, fraction, exppart = \
36-
s[a1:b1], s[a2:b2], s[a3:b3], s[a5:b5]
33+
m = decoder.match(s)
34+
if not m: raise NotANumber
35+
sign, intpart, fraction, exppart = m.group(1, 2, 3, 5)
3736
if sign == '+': sign = ''
3837
if fraction: fraction = fraction[1:]
3938
if exppart: expo = eval(exppart[1:])

‎Lib/glob.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os
44
import fnmatch
5-
import regex
5+
import re
66

77

88
def glob(pathname):
@@ -50,7 +50,7 @@ def glob1(dirname, pattern):
5050
return result
5151

5252

53-
magic_check = regex.compile('[*?[]')
53+
magic_check = re.compile('[*?[]')
5454

5555
def has_magic(s):
56-
return magic_check.search(s) >= 0
56+
return magic_check.search(s) is not None

‎Lib/keyword.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
# To update the symbols in this file, 'cd' to the top directory of
88
# the python source tree after building the interpreter and run:
99
#
10-
# PYTHONPATH=./Lib ./python Lib/keyword.py
11-
#
12-
# (this path allows the import of string.py and regexmodule.so
13-
# for a site with no installation in place)
10+
# python Lib/keyword.py
1411

1512
kwlist = [
1613
#--start keywords--
@@ -52,7 +49,7 @@
5249
iskeyword = kwdict.has_key
5350

5451
def main():
55-
import sys, regex, string
52+
import sys, re, string
5653

5754
args = sys.argv[1:]
5855
iptfile = args and args[0] or "Python/graminit.c"
@@ -61,13 +58,15 @@ def main():
6158

6259
# scan the source file for keywords
6360
fp = open(iptfile)
64-
strprog = regex.compile('"\([^"]+\)"')
61+
strprog = re.compile('"([^"]+)"')
6562
lines = []
6663
while 1:
6764
line = fp.readline()
6865
if not line: break
69-
if string.find(line, '{1, "') > -1 and strprog.search(line) > -1:
70-
lines.append(" '" + strprog.group(1) + "',\n")
66+
if string.find(line, '{1, "') > -1:
67+
match = strprog.search(line)
68+
if match:
69+
lines.append(" '" + match.group(1) + "',\n")
7170
fp.close()
7271
lines.sort()
7372

@@ -90,4 +89,5 @@ def main():
9089
fp.write(string.join(format, ''))
9190
fp.close()
9291

93-
if __name__ == "__main__": main()
92+
if __name__ == "__main__":
93+
main()

‎Lib/lib-old/fmt.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,9 @@ def invert(self, d, region):
461461
self.paralist[para2].invert(d, pos1, pos2)
462462
#
463463
def search(self, prog):
464-
import regex, string
464+
import re, string
465465
if type(prog) == type(''):
466-
prog = regex.compile(string.lower(prog))
466+
prog = re.compile(string.lower(prog))
467467
if self.selection:
468468
iold = self.selection[0][0]
469469
else:
@@ -474,8 +474,9 @@ def search(self, prog):
474474
continue
475475
p = self.paralist[i]
476476
text = string.lower(p.extract())
477-
if prog.search(text) >= 0:
478-
a, b = prog.regs[0]
477+
match = prog.search(text)
478+
if match:
479+
a, b = match.group(0)
479480
long1 = i, a
480481
long2 = i, b
481482
hit = long1, long2

‎Lib/mailbox.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import rfc822
77
import os
8-
import regex
98

109
class _Mailbox:
1110
def __init__(self, fp):
@@ -117,12 +116,13 @@ def _search_end(self):
117116

118117
class MHMailbox:
119118
def __init__(self, dirname):
120-
pat = regex.compile('^[0-9][0-9]*$')
119+
import re
120+
pat = re.compile('^[0-9][0-9]*$')
121121
self.dirname = dirname
122122
files = os.listdir(self.dirname)
123123
self.boxes = []
124124
for f in files:
125-
if pat.match(f) == len(f):
125+
if pat.match(f):
126126
self.boxes.append(f)
127127

128128
def next(self):
@@ -187,6 +187,7 @@ def _test():
187187
if not msg:
188188
break
189189
msgs.append(msg)
190+
msg.fp = None
190191
if len(args) > 1:
191192
num = string.atoi(args[1])
192193
print 'Message %d body:'%num

‎Lib/mhlib.py‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import os
7474
import sys
7575
from stat import ST_NLINK
76-
import regex
76+
import re
7777
import string
7878
import mimetools
7979
import multifile
@@ -236,9 +236,9 @@ def deletefolder(self, name):
236236

237237
# Class representing a particular folder
238238

239-
numericprog = regex.compile('^[1-9][0-9]*$')
239+
numericprog = re.compile('^[1-9][0-9]*$')
240240
def isnumeric(str):
241-
return numericprog.match(str) >= 0
241+
return numericprog.match(str) is not None
242242

243243
class Folder:
244244

@@ -906,15 +906,12 @@ def pickline(file, key, casefold = 1):
906906
f = open(file, 'r')
907907
except IOError:
908908
return None
909-
pat = key + ':'
910-
if casefold:
911-
prog = regex.compile(pat, regex.casefold)
912-
else:
913-
prog = regex.compile(pat)
909+
pat = re.escape(key) + ':'
910+
prog = re.compile(pat, casefold and re.IGNORECASE)
914911
while 1:
915912
line = f.readline()
916913
if not line: break
917-
if prog.match(line) >= 0:
914+
if prog.match(line):
918915
text = line[len(key)+1:]
919916
while 1:
920917
line = f.readline()
@@ -931,18 +928,15 @@ def updateline(file, key, value, casefold = 1):
931928
f.close()
932929
except IOError:
933930
lines = []
934-
pat = key + ':\(.*\)\n'
935-
if casefold:
936-
prog = regex.compile(pat, regex.casefold)
937-
else:
938-
prog = regex.compile(pat)
931+
pat = re.escape(key) + ':(.*)\n'
932+
prog = re.compile(pat, casefold and re.IGNORECASE)
939933
if value is None:
940934
newline = None
941935
else:
942936
newline = '%s: %s\n' % (key, value)
943937
for i in range(len(lines)):
944938
line = lines[i]
945-
if prog.match(line) == len(line):
939+
if prog.match(line):
946940
if newline is None:
947941
del lines[i]
948942
else:

‎Lib/nntplib.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
# Imports
32-
import regex
32+
import re
3333
import socket
3434
import string
3535

@@ -313,13 +313,13 @@ def slave(self):
313313
# - list: list of (nr, value) strings
314314

315315
def xhdr(self, hdr, str):
316+
pat = re.compile('^([0-9]+) ?(.*)\n?')
316317
resp, lines = self.longcmd('XHDR ' + hdr + ' ' + str)
317318
for i in range(len(lines)):
318319
line = lines[i]
319-
n = regex.match('^[0-9]+', line)
320-
nr = line[:n]
321-
if n < len(line) and line[n] == ' ': n = n+1
322-
lines[i] = (nr, line[n:])
320+
m = pat.match(line)
321+
if m:
322+
lines[i] = m.group(1, 2)
323323
return resp, lines
324324

325325
# Process an XOVER command (optional server extension) Arguments:
@@ -354,14 +354,13 @@ def xover(self,start,end):
354354
# - list: list of (name,title) strings
355355

356356
def xgtitle(self, group):
357-
line_pat = regex.compile("^\([^ \t]+\)[ \t]+\(.*\)$")
357+
line_pat = re.compile("^([^ \t]+)[ \t]+(.*)$")
358358
resp, raw_lines = self.longcmd('XGTITLE ' + group)
359359
lines = []
360360
for raw_line in raw_lines:
361-
if line_pat.search(string.strip(raw_line)) == 0:
362-
lines.append(line_pat.group(1),
363-
line_pat.group(2))
364-
361+
match = line_pat.search(string.strip(raw_line))
362+
if match:
363+
lines.append(match.group(1, 2))
365364
return resp, lines
366365

367366
# Process an XPATH command (optional server extension) Arguments:

‎Lib/pipes.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262

6363
import sys
64-
import regex
64+
import re
6565

6666
import os
6767
import tempfile
@@ -124,10 +124,10 @@ def append(self, cmd, kind):
124124
if self.steps <> [] and self.steps[-1][1] == SINK:
125125
raise ValueError, \
126126
'Template.append: already ends with SINK'
127-
if kind[0] == 'f' and regex.search('\$IN', cmd) < 0:
127+
if kind[0] == 'f' and not re.search('\$IN\b', cmd):
128128
raise ValueError, \
129129
'Template.append: missing $IN in cmd'
130-
if kind[1] == 'f' and regex.search('\$OUT', cmd) < 0:
130+
if kind[1] == 'f' and not re.search('\$OUT\b', cmd):
131131
raise ValueError, \
132132
'Template.append: missing $OUT in cmd'
133133
self.steps.append((cmd, kind))
@@ -146,10 +146,10 @@ def prepend(self, cmd, kind):
146146
if self.steps <> [] and self.steps[0][1] == SOURCE:
147147
raise ValueError, \
148148
'Template.prepend: already begins with SOURCE'
149-
if kind[0] == 'f' and regex.search('\$IN\>', cmd) < 0:
149+
if kind[0] == 'f' and not re.search('\$IN\b', cmd):
150150
raise ValueError, \
151151
'Template.prepend: missing $IN in cmd'
152-
if kind[1] == 'f' and regex.search('\$OUT\>', cmd) < 0:
152+
if kind[1] == 'f' and not re.search('\$OUT\b', cmd):
153153
raise ValueError, \
154154
'Template.prepend: missing $OUT in cmd'
155155
self.steps.insert(0, (cmd, kind))

0 commit comments

Comments
 (0)