Backport 70111: Let configparser use ordered dicts by default.
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index bab44d4..0c5bb15 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -75,6 +75,9 @@
.. versionchanged:: 2.6
*dict_type* was added.
+ .. versionchanged:: 2.7
+ The default *dict_type* is :class:`collections.OrderedDict`.
+
.. class:: ConfigParser([defaults[, dict_type]])
@@ -91,6 +94,14 @@
option names to lower case), the values ``foo %(bar)s`` and ``foo %(BAR)s`` are
equivalent.
+ .. versionadded:: 2.3
+
+ .. versionchanged:: 2.6
+ *dict_type* was added.
+
+ .. versionchanged:: 2.7
+ The default *dict_type* is :class:`collections.OrderedDict`.
+
.. class:: SafeConfigParser([defaults[, dict_type]])
@@ -103,6 +114,12 @@
.. versionadded:: 2.3
+ .. versionchanged:: 2.6
+ *dict_type* was added.
+
+ .. versionchanged:: 2.7
+ The default *dict_type* is :class:`collections.OrderedDict`.
+
.. exception:: NoSectionError
diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py
index b6af6f9..1861b5a 100644
--- a/Lib/ConfigParser.py
+++ b/Lib/ConfigParser.py
@@ -87,6 +87,12 @@
write the configuration state in .ini format
"""
+try:
+ from collections import OrderedDict as _default_dict
+except ImportError:
+ # fallback for setup.py which hasn't yet built _collections
+ _default_dict = dict
+
import re
__all__ = ["NoSectionError", "DuplicateSectionError", "NoOptionError",
@@ -215,7 +221,7 @@
class RawConfigParser:
- def __init__(self, defaults=None, dict_type=dict):
+ def __init__(self, defaults=None, dict_type=_default_dict):
self._dict = dict_type
self._sections = self._dict()
self._defaults = self._dict()
diff --git a/Misc/NEWS b/Misc/NEWS
index 70160bb..d91164f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -172,6 +172,8 @@
- The _asdict() for method for namedtuples now returns an OrderedDict().
+- The configparser module now defaults to using an ordered dictionary.
+
- Issue #4308: httplib.IncompleteRead's repr doesn't include all of the data all
ready received.