From: Jelte Jansen Date: Fri, 1 Feb 2013 13:31:00 +0000 (+0100) Subject: [1901] small style fixes X-Git-Tag: bind10-1.0.0-rc-release~39^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a85aff6a94f4f8e08bf3beaaf4da6e282b28e253;p=thirdparty%2Fkea.git [1901] small style fixes --- diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py index 7d3a14f09e..4e71030a26 100644 --- a/src/lib/python/isc/config/cfgmgr.py +++ b/src/lib/python/isc/config/cfgmgr.py @@ -90,10 +90,15 @@ class ConfigManagerData: # Don't know what to do if it is more recent if data_version > config_data.BIND10_CONFIG_DATA_VERSION: - raise ConfigManagerDataReadError("Cannot load configuration file: version %d not yet supported" % config['version']) + raise ConfigManagerDataReadError( + "Cannot load configuration file: version " + "%d not yet supported" % config['version']) + # At some point we might give up supporting older versions if data_version < 1: - raise ConfigManagerDataReadError("Cannot load configuration file: version %d no longer supported" % config['version']) + raise ConfigManagerDataReadError( + "Cannot load configuration file: version " + "%d no longer supported" % config['version']) # Ok, so we have a still-supported older version. Apply all # updates diff --git a/src/lib/python/isc/config/tests/cfgmgr_test.py b/src/lib/python/isc/config/tests/cfgmgr_test.py index f3b410cc9a..d99fb863e7 100644 --- a/src/lib/python/isc/config/tests/cfgmgr_test.py +++ b/src/lib/python/isc/config/tests/cfgmgr_test.py @@ -92,7 +92,6 @@ class TestConfigManagerData(unittest.TestCase): config['version'] = config_data.BIND10_CONFIG_DATA_VERSION self.assertEqual(config, updated) - def test_read_from_file(self): ConfigManagerData.read_from_file(self.writable_data_path, "b10-config.db") self.assertRaises(ConfigManagerDataEmpty,