From e657cc3a8d5b2a95b2fda07dd4e5ba637f7a359c Mon Sep 17 00:00:00 2001
From: ohemorange <ebportnoy@gmail.com>
Date: Tue, 28 Jan 2025 10:54:11 -0800
Subject: [PATCH] [apache] Add type hints to apache parser.py (to enable mypy
 --strict) (#10152)

```
$ mypy --strict certbot-apache/certbot_apache/_internal/parser.py
Success: no issues found in 1 source file
```

`typing.Pattern` is deprecated in python 3.9 in favor of using
`re.Pattern` directly, and also wants to be subscripted with its type.

`python-augeas` types can be found in
https://github.com/hercules-team/python-augeas/blob/a1e84a7e58e535658f681731b66eca7b71c095a2/augeas/__init__.py
---
 certbot-apache/certbot_apache/_internal/parser.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/certbot-apache/certbot_apache/_internal/parser.py b/certbot-apache/certbot_apache/_internal/parser.py
index 956560302..5efd63adc 100644
--- a/certbot-apache/certbot_apache/_internal/parser.py
+++ b/certbot-apache/certbot_apache/_internal/parser.py
@@ -9,7 +9,6 @@ from typing import Iterable
 from typing import List
 from typing import Mapping
 from typing import Optional
-from typing import Pattern
 from typing import Set
 from typing import Tuple
 from typing import TYPE_CHECKING
@@ -43,7 +42,7 @@ class ApacheParser:
         default - user config file, name - NameVirtualHost,
 
     """
-    arg_var_interpreter: Pattern = re.compile(r"\$\{[^ \}]*}")
+    arg_var_interpreter: re.Pattern[str] = re.compile(r"\$\{[^ \}]*}")
     fnmatch_chars: Set[str] = {"*", "?", "\\", "[", "]"}
 
     # pylint: disable=unused-argument
@@ -127,7 +126,7 @@ class ApacheParser:
 
         self.aug.set("/test/path/testing/arg", "aRgUMeNT")
         try:
-            matches = self.aug.match(
+            matches: List[str] = self.aug.match(
                 "/test//*[self::arg=~regexp('argument', 'i')]")
         except RuntimeError:
             self.aug.remove("/test/path")
@@ -390,7 +389,7 @@ class ApacheParser:
         :rtype: str
 
         """
-        if_mods = self.aug.match(("%s/IfModule/*[self::arg='%s']" %
+        if_mods: List[str] = self.aug.match(("%s/IfModule/*[self::arg='%s']" %
                                   (aug_conf_path, mod)))
         if not if_mods:
             return self.create_ifmod(aug_conf_path, mod)
@@ -578,7 +577,7 @@ class ApacheParser:
         This also converts all variables and parameters appropriately.
 
         """
-        value = self.aug.get(match)
+        value: str = self.aug.get(match)
 
         # No need to strip quotes for variables, as apache2ctl already does
         # this, but we do need to strip quotes for all normal arguments.