Use re in stead of regex.

diff --git a/Mac/scripts/MkDistr.py b/Mac/scripts/MkDistr.py
index a8728ab94fd8b6bbe6509dcf49af314747d90c32..f446b343c51147ef35a77cc1610cc1efe7fd63e6 100644 (file)
--- a/Mac/scripts/MkDistr.py
+++ b/Mac/scripts/MkDistr.py
@@ -16,7 +16,7 @@
 #
 from MkDistr_ui import *
 import fnmatch
-import regex
+import re
 import os
 import sys
 import macfs
@@ -187,7 +187,7 @@ class ExcMatcher(Matcher):
                pat = fnmatch.translate(src)
                if DEBUG:
                        print 'PATTERN', `src`, 'REGEX', `pat`
-               self.relist.append(regex.compile(pat))
+               self.relist.append(re.compile(pat))
                
        def unrebuild1(self, num, src):
                del self.relist[num]
@@ -196,7 +196,7 @@ class ExcMatcher(Matcher):
                comps = os.path.split(path)
                file = comps[-1]
                for pat in self.relist:
-                       if pat and pat.match(file) == len(file):
+                       if pat and pat.match(file):
                                if DEBUG:
                                        print 'excmatch', file, pat
                                return 1

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 73ccc8f27b20a505730a4d88726e4d765bd541f4..4f718fd0bad46fad4720b5e35d1afeaddbe4ae8b 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -16,7 +16,7 @@ import sys
 import macfs
 import MacOS
 import EasyDialogs
-import regex
+import re
 import string
 
 import aetools
@@ -278,11 +278,11 @@ def incbuildno(filename):
        line = fp.readline()
        fp.close()
        
-       pat = regex.compile('#define BUILD \([0-9][0-9]*\)')
-       pat.match(line)
-       buildno = pat.group(1)
-       if not buildno:
+       pat = re.compile('#define BUILD ([0-9]+)')
+       m = pat.search(line)
+       if not m or not m.group(1):
                raise 'Incorrect macbuildno.h line', line
+       buildno = m.group(1)
        new = string.atoi(buildno) + 1
        fp = open(filename, 'w')
        fp.write('#define BUILD %d\n'%new)

diff --git a/Mac/scripts/mkestrres.py b/Mac/scripts/mkestrres.py
index c19e6d0ba29c968c5fb96fe0eada46cc624e73e0..3ed3b34f6df89ac9d6f848effe5870d9c75812b2 100644 (file)
--- a/Mac/scripts/mkestrres.py
+++ b/Mac/scripts/mkestrres.py
@@ -1,6 +1,6 @@
 """Parse sys/errno.h and Errors.h and create Estr resource"""
 
-import regex
+import re
 import macfs
 import string
 import Res
@@ -11,25 +11,25 @@ WRITE = 2
 smAllScripts = -3
 
 ERRNO_PROG="#define[ \t]+" \
-                  "\([A-Z0-9a-z_]+\)" \
+                  "([A-Z0-9a-z_]+)" \
                   "[ \t]+" \
-                  "\([0-9]+\)" \
+                  "([0-9]+)" \
                   "[ \t]*/\*[ \t]*" \
-                  "\(.*\)" \
+                  "(.*)" \
                   "[ \t]*\*/"
                   
 ERRORS_PROG="[ \t]*" \
-                       "\([A-Z0-9a-z_]+\)" \
+                       "([A-Z0-9a-z_]+)" \
                        "[ \t]*=[ \t]*" \
-                       "\([-0-9]+\)" \
+                       "([-0-9]+)" \
                        "[, \t]*/\*[ \t]*" \
-                       "\(.*\)" \
+                       "(.*)" \
                        "[ \t]*\*/"
                   
 ERRORS_PROG_2="[ \t]*" \
-                       "\([A-Z0-9a-z_]+\)" \
+                       "([A-Z0-9a-z_]+)" \
                        "[ \t]*=[ \t]*" \
-                       "\([-0-9]+\)" \
+                       "([-0-9]+)" \
                        "[, \t]*"
 
 def Pstring(str):
@@ -58,12 +58,13 @@ def writepython(fp, dict):
        
 
 def parse_errno_h(fp, dict):
-       errno_prog = regex.compile(ERRNO_PROG)
+       errno_prog = re.compile(ERRNO_PROG)
        for line in fp.readlines():
-               if errno_prog.match(line) > 0:
-                       number = string.atoi(errno_prog.group(2))
-                       name = errno_prog.group(1)
-                       desc = string.strip(errno_prog.group(3))
+               m = errno_prog.match(line)
+               if m:
+                       number = string.atoi(m.group(2))
+                       name = m.group(1)
+                       desc = string.strip(m.group(3))
                        
                        if not dict.has_key(number):
                                dict[number] = desc, name
@@ -73,18 +74,20 @@ def parse_errno_h(fp, dict):
                                print '\t', (desc, name)
                                                                
 def parse_errors_h(fp, dict):
-       errno_prog = regex.compile(ERRORS_PROG)
-       errno_prog_2 = regex.compile(ERRORS_PROG_2)
+       errno_prog = re.compile(ERRORS_PROG)
+       errno_prog_2 = re.compile(ERRORS_PROG_2)
        for line in fp.readlines():
                match = 0
-               if errno_prog.match(line) > 0:
-                       number = string.atoi(errno_prog.group(2))
-                       name = errno_prog.group(1)
-                       desc = string.strip(errno_prog.group(3))
+               m = errno_prog.match(line)
+               m2 = errno_prog_2.match(line)
+               if m:
+                       number = string.atoi(m.group(2))
+                       name = m.group(1)
+                       desc = string.strip(m.group(3))
                        match=1
-               elif errno_prog_2.match(line) > 0:
-                       number = string.atoi(errno_prog_2.group(2))
-                       name = errno_prog_2.group(1)
+               elif m2:
+                       number = string.atoi(m2.group(2))
+                       name = m2.group(1)
                        desc = name
                        match=1
                if match: