Fixed Pythonwin's editor failing due to invalid regex import (#2419)

.github/workflows/main.yml

@@ -143,7 +143,7 @@ jobs:
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
           check-latest: true
-      - run: pip install types-regex types-setuptools PyOpenGL mypy==1.11
+      - run: pip install types-setuptools PyOpenGL mypy==1.11
       - run: mypy . --python-version=${{ matrix.python-version }}
 
   pyright:
@@ -162,7 +162,7 @@ jobs:
           cache-dependency-path: .github/workflows/main.yml
           check-latest: true
       # pyright vendors typeshed, but let's make sure we have the most up to date stubs
-      - run: pip install types-regex types-setuptools PyOpenGL
+      - run: pip install types-setuptools PyOpenGL
       - uses: jakebailey/pyright-action@v2
         with:
           python-version: ${{ matrix.python-version }}

CHANGES.txt

@@ -14,6 +14,7 @@ https://mhammond.github.io/pywin32_installers.html.
 Coming in build 309, as yet unreleased
 --------------------------------------
 
+* Fixed Pythonwin's editor failing due to invalid regex import (#2419, @Avasam)
 * Last error wrongly set by some modules (#2302, @CristiFati)
 * Dropped support for Python 3.7 (#2207, @Avasam)
 * Implement the creation of SAFEARRAY(VT_RECORD) from a sequence of COM Records (#2317, @geppi)

Pythonwin/pywin/framework/editor/editor.py

@@ -19,7 +19,6 @@
 
 import re
 
-import regex
 import win32api
 import win32con
 import win32ui
@@ -36,8 +35,8 @@
 # from pywin.mfc.docview import EditView as ParentEditorView
 # from pywin.mfc.docview import Document as ParentEditorDocument
 
-patImport = regex.symcomp(r"import \(<name>.*\)")
-patIndent = regex.compile(r"^\([ \t]*[~ \t]\)")
+patImport = re.compile(r"import (?P<name>.*)")
+patIndent = re.compile(r"^([ \t]*[~ \t])")
 
 ID_LOCATE_FILE = 0xE200
 ID_GOTO_LINE = 0xE2001
@@ -364,9 +363,10 @@ def OnRClick(self, params):
         # look for a module name
         line = self._obj_.GetLine().strip()
         flags = win32con.MF_STRING | win32con.MF_ENABLED
-        if patImport.match(line) == len(line):
+        matchResult = patImport.match(line)
+        if matchResult and matchResult[0] == line:
             menu.AppendMenu(
-                flags, ID_LOCATE_FILE, "&Locate %s.py" % patImport.group("name")
+                flags, ID_LOCATE_FILE, "&Locate %s.py" % matchResult.group("name")
             )
             menu.AppendMenu(win32con.MF_SEPARATOR)
         menu.AppendMenu(flags, win32ui.ID_EDIT_UNDO, "&Undo")

Pythonwin/pywin/framework/mdi_pychecker.py

@@ -145,8 +145,7 @@ def __radd__(self, other):
 
 
 # Group(1) is the filename, group(2) is the lineno.
-# regexGrepResult=regex.compile(r"^\([a-zA-Z]:.*\)(\([0-9]+\))")
-# regexGrep=re.compile(r"^([a-zA-Z]:[^(]*)\((\d+)\)")
+# regexGrep = re.compile(r"^([a-zA-Z]:[^(]*)\((\d+)\)")
 regexGrep = re.compile(r"^(..[^\(:]+)?[\(:](\d+)[\):]:?\s*(.*)")
 
 # these are the atom numbers defined by Windows for basic dialog controls

Pythonwin/pywin/framework/sgrepmdi.py

@@ -127,8 +127,6 @@ def __radd__(self, other):
 
 
 # Group(1) is the filename, group(2) is the lineno.
-# regexGrepResult=regex.compile(r"^\([a-zA-Z]:.*\)(\([0-9]+\))")
-
 regexGrep = re.compile(r"^([a-zA-Z]:[^(]*)\(([0-9]+)\)")
 
 # these are the atom numbers defined by Windows for basic dialog controls