@@ -1257,12 +1257,10 @@ def Print_Function():
12571257 return
12581258
12591259
1260- import re as regrep
1261-
1262- op_cntrct = regrep .compile (r'(([A-Za-z0-9\_\#]+)(\||<|>)([A-Za-z0-9\_\#]+))' )
1263- op_wedge = regrep .compile (r'(([A-Za-z0-9\_\#]+)[\^]{1}([A-Za-z0-9\_\#]+)([\^]{1}([A-Za-z0-9\_\#]+))*)' )
1260+ op_cntrct = re .compile (r'(([A-Za-z0-9\_\#]+)(\||<|>)([A-Za-z0-9\_\#]+))' )
1261+ op_wedge = re .compile (r'(([A-Za-z0-9\_\#]+)[\^]{1}([A-Za-z0-9\_\#]+)([\^]{1}([A-Za-z0-9\_\#]+))*)' )
12641262ops = r'[\^\|\<\>]+'
1265- ops_search = regrep .compile (r'(\^|\||<|>)+' )
1263+ ops_search = re .compile (r'(\^|\||<|>)+' )
12661264parse_paren_calls = 0
12671265global_dict = {}
12681266op_dict = {}
@@ -1279,7 +1277,7 @@ def def_prec(gd, op_ord='<>|,^,*'): # Default is Doran and Lasenby convention
12791277 op_lst = op_ord .split (',' )
12801278 op_dict = {}
12811279 for op in op_lst :
1282- op_dict [op ] = regrep .compile (OPS [op ])
1280+ op_dict [op ] = re .compile (OPS [op ])
12831281 return
12841282
12851283
@@ -1399,13 +1397,13 @@ def add_paren(line, re_exprs):
13991397 for level in line_levels :
14001398 igroup = 0
14011399 for group in level :
1402- group [- 1 ] = regrep .sub (re_exprs , sub_paren , group [- 1 ])
1400+ group [- 1 ] = re .sub (re_exprs , sub_paren , group [- 1 ])
14031401 line_levels [ilevel ][igroup ] = group
14041402 igroup += 1
14051403 ilevel += 1
14061404 line = unparse_paren (line_levels )
14071405 else :
1408- line = regrep .sub (re_exprs , sub_paren , line )
1406+ line = re .sub (re_exprs , sub_paren , line )
14091407 if paren_flg :
14101408 line = '(' + line + ')'
14111409 return line
0 commit comments