Skip to content

Commit d301635

Browse files
author
neal.norwitz
committed
Remove regsub, reconvert, regex, regex_syntax and everything under lib-old.
git-svn-id: http://svn.python.org/projects/python/trunk@43073 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent d455ec7 commit d301635

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+73
-7120
lines changed

Demo/pdist/makechangelog.py

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

77
import sys
88
import string
9-
import regex
9+
import re
1010
import getopt
1111
import time
1212

@@ -35,9 +35,9 @@ def main():
3535
for rev in allrevs:
3636
formatrev(rev, prefix)
3737

38-
parsedateprog = regex.compile(
39-
'^date: \([0-9]+\)/\([0-9]+\)/\([0-9]+\) ' +
40-
'\([0-9]+\):\([0-9]+\):\([0-9]+\); author: \([^ ;]+\)')
38+
parsedateprog = re.compile(
39+
'^date: ([0-9]+)/([0-9]+)/([0-9]+) ' +
40+
'([0-9]+):([0-9]+):([0-9]+); author: ([^ ;]+)')
4141

4242
authormap = {
4343
'guido': 'Guido van Rossum <[email protected]>',
@@ -70,7 +70,7 @@ def formatrev(rev, prefix):
7070
print
7171
print
7272

73-
startprog = regex.compile("^Working file: \(.*\)$")
73+
startprog = re.compile("^Working file: (.*)$")
7474

7575
def getnextfile(f):
7676
while 1:

Demo/pdist/rcsbump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Python script for bumping up an RCS major revision number.
77

88
import sys
9-
import regex
9+
import re
1010
import rcslib
1111
import string
1212

1313
WITHLOCK = 1
14-
majorrev_re = regex.compile('^[0-9]+')
14+
majorrev_re = re.compile('^[0-9]+')
1515

1616
dir = rcslib.RCS()
1717

Demo/pdist/rcslib.py

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

99
import fnmatch
1010
import os
11-
import regsub
11+
import re
1212
import string
1313
import tempfile
1414

@@ -150,7 +150,7 @@ def checkin(self, name_rev, message=None, otherflags=""):
150150
cmd = 'ci %s%s -t%s %s %s' % \
151151
(lockflag, rev, f.name, otherflags, name)
152152
else:
153-
message = regsub.gsub('\([\\"$`]\)', '\\\\\\1', message)
153+
message = re.sub(r'([\"$`])', r'\\\1', message)
154154
cmd = 'ci %s%s -m"%s" %s %s' % \
155155
(lockflag, rev, message, otherflags, name)
156156
return self._system(cmd)

Demo/scripts/eqfix.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# into a program for a different change to Python programs...
3030

3131
import sys
32-
import regex
32+
import re
3333
import os
3434
from stat import *
3535
import string
@@ -53,7 +53,7 @@ def main():
5353
if fix(arg): bad = 1
5454
sys.exit(bad)
5555

56-
ispythonprog = regex.compile('^[a-zA-Z0-9_]+\.py$')
56+
ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$')
5757
def ispython(name):
5858
return ispythonprog.match(name) >= 0
5959

@@ -104,7 +104,7 @@ def fix(filename):
104104
if lineno == 1 and g is None and line[:2] == '#!':
105105
# Check for non-Python scripts
106106
words = string.split(line[2:])
107-
if words and regex.search('[pP]ython', words[0]) < 0:
107+
if words and re.search('[pP]ython', words[0]) < 0:
108108
msg = filename + ': ' + words[0]
109109
msg = msg + ' script; not fixed\n'
110110
err(msg)

Demo/scripts/ftpstats.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
import os
1515
import sys
16-
import regex
16+
import re
1717
import string
1818
import getopt
1919

20-
pat = '^\([a-zA-Z0-9 :]*\)!\(.*\)!\(.*\)!\([<>].*\)!\([0-9]+\)!\([0-9]+\)$'
21-
prog = regex.compile(pat)
20+
pat = '^([a-zA-Z0-9 :]*)!(.*)!(.*)!([<>].*)!([0-9]+)!([0-9]+)$'
21+
prog = re.compile(pat)
2222

2323
def main():
2424
maxitems = 25

Demo/scripts/mboxconvert.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import os
1111
import stat
1212
import getopt
13-
import regex
13+
import re
1414

1515
def main():
1616
dofile = mmdf
@@ -45,7 +45,7 @@ def main():
4545
if sts:
4646
sys.exit(sts)
4747

48-
numeric = regex.compile('[1-9][0-9]*')
48+
numeric = re.compile('[1-9][0-9]*')
4949

5050
def mh(dir):
5151
sts = 0

Demo/scripts/update.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
import os
1010
import sys
11-
import regex
11+
import re
1212

13-
pat = '^\([^: \t\n]+\):\([1-9][0-9]*\):'
14-
prog = regex.compile(pat)
13+
pat = '^([^: \t\n]+):([1-9][0-9]*):'
14+
prog = re.compile(pat)
1515

1616
class FileObj:
1717
def __init__(self, filename):

Demo/sockets/mcast.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import sys
1414
import time
1515
import struct
16-
import regsub
1716
from socket import *
1817

1918

Demo/tkinter/guido/ManPage.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Widget to display a man page
22

3-
import regex
3+
import re
44
from Tkinter import *
55
from Tkinter import _tkinter
66
from ScrolledText import ScrolledText
@@ -11,10 +11,10 @@
1111

1212
# XXX Recognizing footers is system dependent
1313
# (This one works for IRIX 5.2 and Solaris 2.2)
14-
footerprog = regex.compile(
14+
footerprog = re.compile(
1515
'^ Page [1-9][0-9]*[ \t]+\|^.*Last change:.*[1-9][0-9]*\n')
16-
emptyprog = regex.compile('^[ \t]*\n')
17-
ulprog = regex.compile('^[ \t]*[Xv!_][Xv!_ \t]*\n')
16+
emptyprog = re.compile('^[ \t]*\n')
17+
ulprog = re.compile('^[ \t]*[Xv!_][Xv!_ \t]*\n')
1818

1919
# Basic Man Page class -- does not disable editing
2020
class EditableManPage(ScrolledText):

Demo/tkinter/guido/mbox.py

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

55
import os
66
import sys
7-
import regex
7+
import re
88
import getopt
99
import string
1010
import mhlib
@@ -157,7 +157,7 @@ def scan_unpost(e):
157157
scanmenu.unpost()
158158
scanmenu.invoke('active')
159159

160-
scanparser = regex.compile('^ *\([0-9]+\)')
160+
scanparser = re.compile('^ *([0-9]+)')
161161

162162
def open_folder(e=None):
163163
global folder, mhf

0 commit comments

Comments
 (0)