mirror of
https://github.com/certbot/certbot.git
synced 2026-08-01 00:35:03 +02:00
pylint: upgrade pinned verson and fix new lints (#8936)
While bumping pinned packages in #8928, we came across a new version of pylint (2.9.3). Upgrading to this version requires some changes to Certbot's code, which is what this change is about. * pylint: upgrade pinned verson and fix new lints * maxsplit should be 1, not -1, for rsplit
This commit is contained in:
@@ -96,8 +96,8 @@ class NginxParser:
|
||||
servers = self._get_raw_servers()
|
||||
|
||||
addr_to_ssl: Dict[Tuple[str, str], bool] = {}
|
||||
for filename in servers:
|
||||
for server, _ in servers[filename]:
|
||||
for server_list in servers.values():
|
||||
for server, _ in server_list:
|
||||
# Parse the server block to save addr info
|
||||
parsed_server = _parse_server_raw(server)
|
||||
for addr in parsed_server['addrs']:
|
||||
@@ -112,8 +112,7 @@ class NginxParser:
|
||||
"""Get a map of unparsed all server blocks
|
||||
"""
|
||||
servers: Dict[str, Union[List, nginxparser.UnspacedList]] = {}
|
||||
for filename in self.parsed:
|
||||
tree = self.parsed[filename]
|
||||
for filename, tree in self.parsed.items():
|
||||
servers[filename] = []
|
||||
srv = servers[filename] # workaround undefined loop var in lambdas
|
||||
|
||||
@@ -141,8 +140,8 @@ class NginxParser:
|
||||
servers = self._get_raw_servers()
|
||||
|
||||
vhosts = []
|
||||
for filename in servers:
|
||||
for server, path in servers[filename]:
|
||||
for filename, server_list in servers.items():
|
||||
for server, path in server_list:
|
||||
# Parse the server block into a VirtualHost object
|
||||
|
||||
parsed_server = _parse_server_raw(server)
|
||||
@@ -240,8 +239,7 @@ class NginxParser:
|
||||
|
||||
"""
|
||||
# Best-effort atomicity is enforced above us by reverter.py
|
||||
for filename in self.parsed:
|
||||
tree = self.parsed[filename]
|
||||
for filename, tree in self.parsed.items():
|
||||
if ext:
|
||||
filename = filename + os.path.extsep + ext
|
||||
if not isinstance(tree, UnspacedList):
|
||||
|
||||
Reference in New Issue
Block a user