upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-04-15 22:20:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[apache] Add type hints to apache parser.py (to enable mypy --strict) (#10152)

Browse source 
```
$ 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
a1e84a7e58/augeas/__init__.py
This commit is contained in:
ohemorange 2025-01-28 10:54:11 -08:00 committed by GitHub
parent a46db66371
commit e657cc3a8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
certbot-apache/certbot_apache/_internal/parser.py
View file

@ -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.