Fixes #4686. Reverts redundant picklability code from r74544.

diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py
index 049373948b65e0e0fb59b807fc51bac51a00b7aa..7e6cdbc30a766f55933cca102afd564522a50806 100644 (file)
--- a/Lib/ConfigParser.py
+++ b/Lib/ConfigParser.py
@@ -134,9 +134,6 @@ class Error(Exception):
     def __repr__(self):
         return self.message
 
-    def __reduce__(self):
-        return self.__class__, (self.message,)
-
     __str__ = __repr__
 
 class NoSectionError(Error):
@@ -145,9 +142,7 @@ class NoSectionError(Error):
     def __init__(self, section):
         Error.__init__(self, 'No section: %r' % (section,))
         self.section = section
-
-    def __reduce__(self):
-        return self.__class__, (self.section,)
+        self.args = (section, )
 
 class DuplicateSectionError(Error):
     """Raised when a section is multiply-created."""
@@ -155,9 +150,7 @@ class DuplicateSectionError(Error):
     def __init__(self, section):
         Error.__init__(self, "Section %r already exists" % section)
         self.section = section
-
-    def __reduce__(self):
-        return self.__class__, (self.section,)
+        self.args = (section, )
 
 class NoOptionError(Error):
     """A requested option was not found."""
@@ -167,9 +160,7 @@ class NoOptionError(Error):
                        (option, section))
         self.option = option
         self.section = section
-
-    def __reduce__(self):
-        return self.__class__, (self.option, self.section)
+        self.args = (option, section)
 
 class InterpolationError(Error):
     """Base class for interpolation-related exceptions."""
@@ -178,9 +169,7 @@ class InterpolationError(Error):
         Error.__init__(self, msg)
         self.option = option
         self.section = section
-
-    def __reduce__(self):
-        return self.__class__, (self.option, self.section, self.message)
+        self.args = (option, section, msg)
 
 class InterpolationMissingOptionError(InterpolationError):
     """A string substitution required a setting which was not available."""
@@ -194,11 +183,7 @@ class InterpolationMissingOptionError(InterpolationError):
                % (section, option, reference, rawval))
         InterpolationError.__init__(self, option, section, msg)
         self.reference = reference
-        self._rawval = rawval
-
-    def __reduce__(self):
-        return self.__class__, (self.option, self.section, self._rawval,
-            self.reference)
+        self.args = (option, section, rawval, reference)
 
 class InterpolationSyntaxError(InterpolationError):
     """Raised when the source text into which substitutions are made
@@ -214,28 +199,21 @@ class InterpolationDepthError(InterpolationError):
                "\trawval : %s\n"
                % (section, option, rawval))
         InterpolationError.__init__(self, option, section, msg)
-        self._rawval = rawval
-
-    def __reduce__(self):
-        return self.__class__, (self.option, self.section, self._rawval)
+        self.args = (option, section, rawval)
 
 class ParsingError(Error):
     """Raised when a configuration file does not follow legal syntax."""
 
-    def __init__(self, filename, _errors=[]):
+    def __init__(self, filename):
         Error.__init__(self, 'File contains parsing errors: %s' % filename)
         self.filename = filename
         self.errors = []
-        for lineno, line in _errors:
-            self.append(lineno, line)
+        self.args = (filename, )
 
     def append(self, lineno, line):
         self.errors.append((lineno, line))
         self.message += '\n\t[line %2d]: %s' % (lineno, line)
 
-    def __reduce__(self):
-        return self.__class__, (self.filename, self.errors)
-
 class MissingSectionHeaderError(ParsingError):
     """Raised when a key-value pair is found before any section header."""
 
@@ -247,9 +225,7 @@ class MissingSectionHeaderError(ParsingError):
         self.filename = filename
         self.lineno = lineno
         self.line = line
-
-    def __reduce__(self):
-        return self.__class__, (self.filename, self.lineno, self.line)
+        self.args = (filename, lineno, line)
 
 
 class RawConfigParser: