Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-117348: Refactored RawConfigParser._read for simplicity and comprehensibility #117372

Merged
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a25ac00
Extract method for _read_inner, reducing complexity and indentation b…
jaraco Mar 27, 2024
1e69aae
Extract method for _raise_all and yield ParseErrors from _read_inner.
jaraco Mar 27, 2024
8c47781
Prefer iterators to splat expansion and literal indexing.
jaraco Mar 27, 2024
7479814
Extract method for _strip_comments. Reduces complexity by 7.
jaraco Mar 27, 2024
a2fffee
Model the file lines in a class to encapsulate the comment status and…
jaraco Mar 28, 2024
23468cb
Encapsulate the read state as a dataclass
jaraco Mar 28, 2024
3d1ef0a
Extract _handle_continuation_line and _handle_rest methods. Reduces c…
jaraco Mar 28, 2024
071baeb
Reindent
jaraco Mar 28, 2024
81f4ce2
At least for now, collect errors in the ReadState
jaraco Mar 28, 2024
8942cc1
Check for missing section header separately.
jaraco Mar 28, 2024
1e72168
Extract methods for _handle_header and _handle_option. Reduces comple…
jaraco Mar 28, 2024
0dfd797
Remove unreachable code. Reduces complexity by 4.
jaraco Mar 28, 2024
77ed897
Remove unreachable branch
jaraco Mar 28, 2024
76f42d3
Handle error condition early. Reduces complexity by 1.
jaraco Mar 28, 2024
c18a2bb
Add blurb
jaraco Mar 29, 2024
97aa785
Move _raise_all to ParsingError, as its behavior is most closely rela…
jaraco Mar 29, 2024
d310cb4
Split _strip* into separate methods.
jaraco Mar 29, 2024
f2a355c
Refactor _strip_full to compute the strip just once and use 'not any'…
jaraco Mar 29, 2024
2492614
Replace use of 'sys.maxsize' with direct computation of the stripped …
jaraco Mar 29, 2024
4968591
Extract has_comments as a dynamic property.
jaraco Mar 29, 2024
7d807bb
Implement clean as a cached property.
jaraco Mar 29, 2024
29cb20f
Model comment prefixes in the RawConfigParser within a prefixes names…
jaraco Mar 29, 2024
c834c35
Use a regular expression to search for the first match.
jaraco Mar 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
At least for now, collect errors in the ReadState
  • Loading branch information
jaraco committed Mar 29, 2024
commit 81f4ce2a52026656bbca67e86415dd19f81be8d9
14 changes: 9 additions & 5 deletions Lib/configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
import os
import re
import sys
from typing import Iterator
from typing import Iterable

__all__ = ("NoSectionError", "DuplicateOptionError", "DuplicateSectionError",
"NoOptionError", "InterpolationError", "InterpolationDepthError",
Expand Down Expand Up @@ -536,6 +536,7 @@ class _ReadState:
optname : str | None = None
lineno : int = 0
indent_level : int = 0
errors : list[ParsingError] = field(default_factory=list)


class _Line(str):
Expand Down Expand Up @@ -1028,10 +1029,11 @@ def _read(self, fp, fpname):
finally:
self._join_multiline_values()

def _raise_all(self, exceptions: Iterator[ParsingError]):
def _raise_all(self, exceptions: Iterable[ParsingError]):
"""
Combine any number of ParsingErrors into one and raise it.
"""
exceptions = iter(exceptions)
with contextlib.suppress(StopIteration):
raise next(exceptions).combine(exceptions)

Expand Down Expand Up @@ -1061,7 +1063,9 @@ def _read_inner(self, fp, fpname):
if self._handle_continuation_line(st, line, fpname):
continue

yield from self._handle_rest(st, line, fpname)
self._handle_rest(st, line, fpname)

return st.errors

def _handle_continuation_line(self, st, line, fpname):
# continuation line?
Expand Down Expand Up @@ -1136,7 +1140,7 @@ def _handle_rest(self, st, line, fpname):
if mo:
st.optname, vi, optval = mo.group('option', 'vi', 'value')
if not st.optname:
yield ParsingError(fpname, st.lineno, line)
st.errors.append(ParsingError(fpname, st.lineno, line))
st.optname = self.optionxform(st.optname.rstrip())
if (self._strict and
(st.sectname, st.optname) in st.elements_added):
Expand All @@ -1156,7 +1160,7 @@ def _handle_rest(self, st, line, fpname):
# exception but keep going. the exception will be
# raised at the end of the file and will contain a
# list of all bogus lines
yield ParsingError(fpname, st.lineno, line)
st.errors.append(ParsingError(fpname, st.lineno, line))

def _join_multiline_values(self):
defaults = self.default_section, self._defaults
Expand Down