[Python-checkins] cpython (merge 3.2 -> default): Merged minor cleanups from 3.2.

[lukasz.langa]

http://hg.python.org/cpython/rev/b41eef4b1804
changeset:   69688:b41eef4b1804
parent:      69685:f8bbd0c29e43
parent:      69687:546cae2917ec
user:        Łukasz Langa <lukasz at langa.pl>
date:        Fri Apr 29 16:17:51 2011 +0200
summary:
  Merged minor cleanups from 3.2.

files:
  Lib/configparser.py           |  2 --
  Lib/test/test_configparser.py |  2 +-
  2 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Lib/configparser.py b/Lib/configparser.py
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -1058,8 +1058,6 @@
                         if not optname:
                             e = self._handle_error(e, fpname, lineno, line)
                         optname = self.optionxform(optname.rstrip())
-                        if hasattr(self, '__ping__'):
-                            import pdb; pdb.set_trace()
                         if (self._strict and
                             (sectname, optname) in elements_added):
                             raise DuplicateOptionError(sectname, optname,
diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -993,7 +993,7 @@
         cf.add_section(123)
         cf.set(123, 'this is sick', True)
         self.assertEqual(cf.get(123, 'this is sick'), True)
-        if cf._dict.__class__ is configparser._default_dict:
+        if cf._dict is configparser._default_dict:
             # would not work for SortedDict; only checking for the most common
             # default dictionary (OrderedDict)
             cf.optionxform = lambda x: x

-- 
Repository URL: http://hg.python.org/cpython