summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2011-04-29 14:17:51 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2011-04-29 14:17:51 (GMT)
commit82710c594b578a3da57e63437ef5fe346ef0f4a7 (patch)
treeeb18f2d043890a19c15ecc1e3f77d7c218a576c9
parent0cd25c9dd95771dfebc22dab9cd07d4a3b916ced (diff)
parent5c7419d4332a9929d8ba0db13d5e2c0db3aee160 (diff)
downloadcpython-82710c594b578a3da57e63437ef5fe346ef0f4a7.zip
cpython-82710c594b578a3da57e63437ef5fe346ef0f4a7.tar.gz
cpython-82710c594b578a3da57e63437ef5fe346ef0f4a7.tar.bz2
Merged minor cleanups from 3.2.
-rw-r--r--Lib/configparser.py2
-rw-r--r--Lib/test/test_configparser.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/Lib/configparser.py b/Lib/configparser.py
index e56f963..b843c00 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -1058,8 +1058,6 @@ class RawConfigParser(MutableMapping):
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
index a712b2b..1db9217 100644
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -993,7 +993,7 @@ class RawConfigParserTestCase(BasicTestCase):
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