Restored Line as str subclass.

Use 'slots' to avoid '__dict__'.

Author: jaraco

Lib/configparser.py

@@ -561,20 +561,15 @@ def __init__(self):
         self.errors = list()
 
 
-class _LineParser:
+class _Line(str):
+    __slots__ = 'clean', 'has_comments'
 
-    def __init__(self, comments):
-        self.comments = comments
+    def __new__(cls, val, *args, **kwargs):
+        return super().__new__(cls, val)
 
-    @property
-    def value(self):
-        return self._value
-
-    @value.setter
-    def value(self, text):
-        self._value = text
-        trimmed = text.strip()
-        self.clean = self.comments.strip(trimmed)
+    def __init__(self, val, comments):
+        trimmed = val.strip()
+        self.clean = comments.strip(trimmed)
         self.has_comments = trimmed != self.clean
 
 
@@ -595,6 +590,9 @@ def __init__(self, full_prefixes, inline_prefixes):
     def strip(self, text):
         return self.pattern.sub('', text).rstrip()
 
+    def load(self, text):
+        return _Line(text, self)
+
 
 class RawConfigParser(MutableMapping):
     """ConfigParser that does not do interpolation."""
@@ -1064,9 +1062,8 @@ def _read(self, fp, fpname):
 
     def _read_inner(self, fp, fpname):
         st = _ReadState()
-        line = _LineParser(self._comments)
 
-        for st.lineno, line.value in enumerate(fp, start=1):
+        for st.lineno, line in enumerate(map(self._comments.load, fp), start=1):
             if not line.clean:
                 if self._empty_lines_in_values:
                     # add empty line to the value, but only if there was no
@@ -1081,7 +1078,7 @@ def _read_inner(self, fp, fpname):
                     st.indent_level = sys.maxsize
                 continue
 
-            first_nonspace = self.NONSPACECRE.search(line.value)
+            first_nonspace = self.NONSPACECRE.search(line)
             st.cur_indent_level = first_nonspace.start() if first_nonspace else 0
 
             if self._handle_continuation_line(st, line, fpname):
@@ -1097,7 +1094,7 @@ def _handle_continuation_line(self, st, line, fpname):
             st.cur_indent_level > st.indent_level)
         if is_continue:
             if st.cursect[st.optname] is None:
-                raise MultilineContinuationError(fpname, st.lineno, line.value)
+                raise MultilineContinuationError(fpname, st.lineno, line)
             st.cursect[st.optname].append(line.clean)
         return is_continue
 
@@ -1111,7 +1108,7 @@ def _handle_rest(self, st, line, fpname):
         mo = self.SECTCRE.match(line.clean)
 
         if not mo and st.cursect is None:
-            raise MissingSectionHeaderError(fpname, st.lineno, line.value)
+            raise MissingSectionHeaderError(fpname, st.lineno, line)
 
         self._handle_header(st, mo.group('header'), fpname) if mo else self._handle_option(st, line, fpname)
 
@@ -1143,12 +1140,12 @@ def _handle_option(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
-            st.errors.append(ParsingError(fpname, st.lineno, line.value))
+            st.errors.append(ParsingError(fpname, st.lineno, line))
             return
 
         st.optname, vi, optval = mo.group('option', 'vi', 'value')
         if not st.optname:
-            st.errors.append(ParsingError(fpname, st.lineno, line.value))
+            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):