get(): Fixed a bug in the merge order of the dictionaries. This makes

a copy of the defaults dictionary and merges the section's dictionary
into it so that sections can override the defaults.

1 files changed, 4 insertions, 3 deletions

diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py
index 2f3ca51..3d44bb5 100644
--- a/Lib/ConfigParser.py
+++ b/Lib/ConfigParser.py
@@ -164,13 +164,14 @@ class ConfigParser:
 	The section DEFAULT is special.
 	"""
 	try:
-	    d = self.__sections[section].copy()
+	    sectdict = self.__sections[section].copy()
 	except KeyError:
 	    if section == DEFAULTSECT:
-		d = {}
+		sectdict = {}
 	    else:
 		raise NoSectionError(section)
-	d.update(self.__defaults)
+	d = self.__defaults.copy()
+	d.update(sectdict)
 	option = string.lower(option)
 	try:
 	    rawval = d[option]