diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/configparser.py (renamed from Lib/ConfigParser.py) | 0 | ||||
| -rw-r--r-- | Lib/distutils/command/upload.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/dist.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/configHandler.py | 2 | ||||
| -rw-r--r-- | Lib/logging/config.py | 4 | ||||
| -rw-r--r-- | Lib/test/test___all__.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_cfgparser.py | 36 |
7 files changed, 24 insertions, 24 deletions
diff --git a/Lib/ConfigParser.py b/Lib/configparser.py index 5e36cc9..5e36cc9 100644 --- a/Lib/ConfigParser.py +++ b/Lib/configparser.py diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py index 34b6692..23999ae 100644 --- a/Lib/distutils/command/upload.py +++ b/Lib/distutils/command/upload.py @@ -10,7 +10,7 @@ from hashlib import md5 import os import socket import platform -import ConfigParser +import configparser import httplib import base64 import urlparse diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index ade2ab7..847eb90 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -349,7 +349,7 @@ Common commands: (see '--help-commands' for more) def parse_config_files (self, filenames=None): - from ConfigParser import ConfigParser + from configparser import ConfigParser if filenames is None: filenames = self.find_config_files() diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py index 9b995cf..8b58bbe 100644 --- a/Lib/idlelib/configHandler.py +++ b/Lib/idlelib/configHandler.py @@ -21,7 +21,7 @@ import os import sys from idlelib import macosxSupport -from ConfigParser import ConfigParser, NoOptionError, NoSectionError +from configparser import ConfigParser, NoOptionError, NoSectionError class InvalidConfigType(Exception): pass class InvalidConfigSet(Exception): pass diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 172f069..006d669 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -62,9 +62,9 @@ def fileConfig(fname, defaults=None): rather than a filename, in which case the file-like object will be read using readfp. """ - import ConfigParser + import configparser - cp = ConfigParser.ConfigParser(defaults) + cp = configparser.ConfigParser(defaults) if hasattr(cp, 'readfp') and hasattr(fname, 'readline'): cp.readfp(fname) else: diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index ab8480f..f6da4fe 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -34,7 +34,7 @@ class AllTest(unittest.TestCase): self.check_all("BaseHTTPServer") self.check_all("CGIHTTPServer") - self.check_all("ConfigParser") + self.check_all("configparser") self.check_all("Cookie") self.check_all("Queue") self.check_all("SimpleHTTPServer") diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py index a2da556..70bf0ac 100644 --- a/Lib/test/test_cfgparser.py +++ b/Lib/test/test_cfgparser.py @@ -1,4 +1,4 @@ -import ConfigParser +import configparser import io import unittest import collections @@ -89,7 +89,7 @@ class TestCaseBase(unittest.TestCase): "remove_option() failed to report non-existance of option" " that was removed") - self.assertRaises(ConfigParser.NoSectionError, + self.assertRaises(configparser.NoSectionError, cf.remove_option, 'No Such Section', 'foo') eq(cf.get('Long Line', 'foo'), @@ -142,17 +142,17 @@ class TestCaseBase(unittest.TestCase): def test_parse_errors(self): self.newconfig() - self.parse_error(ConfigParser.ParsingError, + self.parse_error(configparser.ParsingError, "[Foo]\n extra-spaces: splat\n") - self.parse_error(ConfigParser.ParsingError, + self.parse_error(configparser.ParsingError, "[Foo]\n extra-spaces= splat\n") - self.parse_error(ConfigParser.ParsingError, + self.parse_error(configparser.ParsingError, "[Foo]\noption-without-value\n") - self.parse_error(ConfigParser.ParsingError, + self.parse_error(configparser.ParsingError, "[Foo]\n:value-without-option-name\n") - self.parse_error(ConfigParser.ParsingError, + self.parse_error(configparser.ParsingError, "[Foo]\n=value-without-option-name\n") - self.parse_error(ConfigParser.MissingSectionHeaderError, + self.parse_error(configparser.MissingSectionHeaderError, "No Section!\n") def parse_error(self, exc, src): @@ -165,13 +165,13 @@ class TestCaseBase(unittest.TestCase): "new ConfigParser should have no defined sections") self.failIf(cf.has_section("Foo"), "new ConfigParser should have no acknowledged sections") - self.assertRaises(ConfigParser.NoSectionError, + self.assertRaises(configparser.NoSectionError, cf.options, "Foo") - self.assertRaises(ConfigParser.NoSectionError, + self.assertRaises(configparser.NoSectionError, cf.set, "foo", "bar", "value") - self.get_error(ConfigParser.NoSectionError, "foo", "bar") + self.get_error(configparser.NoSectionError, "foo", "bar") cf.add_section("foo") - self.get_error(ConfigParser.NoOptionError, "foo", "bar") + self.get_error(configparser.NoOptionError, "foo", "bar") def get_error(self, exc, section, option): try: @@ -210,7 +210,7 @@ class TestCaseBase(unittest.TestCase): def test_weird_errors(self): cf = self.newconfig() cf.add_section("Foo") - self.assertRaises(ConfigParser.DuplicateSectionError, + self.assertRaises(configparser.DuplicateSectionError, cf.add_section, "Foo") def test_write(self): @@ -314,7 +314,7 @@ class TestCaseBase(unittest.TestCase): class ConfigParserTestCase(TestCaseBase): - config_class = ConfigParser.ConfigParser + config_class = configparser.ConfigParser def test_interpolation(self): cf = self.get_interpolation_config() @@ -325,11 +325,11 @@ class ConfigParserTestCase(TestCaseBase): "something with lots of interpolation (9 steps)") eq(cf.get("Foo", "bar10"), "something with lots of interpolation (10 steps)") - self.get_error(ConfigParser.InterpolationDepthError, "Foo", "bar11") + self.get_error(configparser.InterpolationDepthError, "Foo", "bar11") def test_interpolation_missing_value(self): cf = self.get_interpolation_config() - e = self.get_error(ConfigParser.InterpolationError, + e = self.get_error(configparser.InterpolationError, "Interpolation Error", "name") self.assertEqual(e.reference, "reference") self.assertEqual(e.section, "Interpolation Error") @@ -365,7 +365,7 @@ class ConfigParserTestCase(TestCaseBase): class RawConfigParserTestCase(TestCaseBase): - config_class = ConfigParser.RawConfigParser + config_class = configparser.RawConfigParser def test_interpolation(self): cf = self.get_interpolation_config() @@ -400,7 +400,7 @@ class RawConfigParserTestCase(TestCaseBase): class SafeConfigParserTestCase(ConfigParserTestCase): - config_class = ConfigParser.SafeConfigParser + config_class = configparser.SafeConfigParser def test_safe_interpolation(self): # See http://www.python.org/sf/511737 |