From dc20d9d1026282a2879992f4cef517a270c8a467 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 8 Jun 2018 12:26:07 -0700 Subject: [PATCH] bpo-33800: Fix default argument for parameter dict_type of ConfigParser/RawConfigParser (GH-7494) (GH-7542) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3b0b90c8c3b8161f0ae9005b83b9b6449d4a8476) Co-authored-by: Andrés Delfino --- Doc/library/configparser.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index 5da5cd9f96..4e55623f53 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -887,7 +887,7 @@ interpolation if an option used is not defined elsewhere. :: ConfigParser Objects -------------------- -.. class:: ConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configparser.DEFAULTSECT, interpolation=BasicInterpolation(), converters={}) +.. class:: ConfigParser(defaults=None, dict_type=dict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configparser.DEFAULTSECT, interpolation=BasicInterpolation(), converters={}) The main configuration parser. When *defaults* is given, it is initialized into the dictionary of intrinsic defaults. When *dict_type* is given, it @@ -949,6 +949,9 @@ ConfigParser Objects providing consistent behavior across the parser: non-string keys and values are implicitly converted to strings. + .. versionchanged:: 3.7 + The default *dict_type* is :class:`dict`, since it now preserves + insertion order. .. method:: defaults() @@ -1205,7 +1208,7 @@ ConfigParser Objects RawConfigParser Objects ----------------------- -.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \ +.. class:: RawConfigParser(defaults=None, dict_type=dict, \ allow_no_value=False, *, delimiters=('=', ':'), \ comment_prefixes=('#', ';'), \ inline_comment_prefixes=None, strict=True, \ @@ -1218,6 +1221,10 @@ RawConfigParser Objects names, and values via its unsafe ``add_section`` and ``set`` methods, as well as the legacy ``defaults=`` keyword argument handling. + .. versionchanged:: 3.7 + The default *dict_type* is :class:`dict`, since it now preserves + insertion order. + .. note:: Consider using :class:`ConfigParser` instead which checks types of the values to be stored internally. If you don't want interpolation, you -- 2.50.1