Add running of pylint in 'make check' and fix things

1 files changed, 17 insertions, 19 deletions

diff --git a/cliapp/settings_tests.py b/cliapp/settings_tests.py
index b5b9eaa..1d6fa84 100644
--- a/cliapp/settings_tests.py
+++ b/cliapp/settings_tests.py
@@ -15,9 +15,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-import optparse
 import StringIO
-import sys
 import unittest
 
 import cliapp
@@ -171,14 +169,14 @@ class SettingsTests(unittest.TestCase):
         def fake_open(filename):
             return StringIO.StringIO('[config]\nfoo = yes\n')
         self.settings.boolean(['foo'], 'foo help')
-        self.settings.load_configs(open=fake_open)
+        self.settings.load_configs(open_file=fake_open)
         self.assertEqual(self.settings['foo'], True)
 
     def test_sets_boolean_to_false_from_config_file(self):
         def fake_open(filename):
             return StringIO.StringIO('[config]\nfoo = False\n')
         self.settings.boolean(['foo'], 'foo help')
-        self.settings.load_configs(open=fake_open)
+        self.settings.load_configs(open_file=fake_open)
         self.assertEqual(self.settings['foo'], False)
 
     def test_adds_bytesize_setting(self):
@@ -232,33 +230,33 @@ class SettingsTests(unittest.TestCase):
         self.assertEqual(self.settings['foo'], 123)
 
     def test_has_list_of_default_config_files(self):
-        defaults = self.settings._default_config_files
+        defaults = self.settings.default_config_files
         self.assert_(isinstance(defaults, list))
         self.assert_(len(defaults) > 0)
 
     def test_listconfs_returns_empty_list_for_nonexistent_directory(self):
-        self.assertEqual(self.settings._listconfs('notexist'), [])
+        self.assertEqual(self.settings.listconfs('notexist'), [])
 
     def test_listconfs_lists_config_files_only(self):
         def mock_listdir(dirname):
             return ['foo.conf', 'foo.notconf']
-        names = self.settings._listconfs('.', listdir=mock_listdir)
+        names = self.settings.listconfs('.', listdir=mock_listdir)
         self.assertEqual(names, ['./foo.conf'])
 
     def test_listconfs_sorts_names_in_C_locale(self):
         def mock_listdir(dirname):
             return ['foo.conf', 'bar.conf']
-        names = self.settings._listconfs('.', listdir=mock_listdir)
+        names = self.settings.listconfs('.', listdir=mock_listdir)
         self.assertEqual(names, ['./bar.conf', './foo.conf'])
 
     def test_has_config_files_attribute(self):
         self.assertEqual(self.settings.config_files,
-                         self.settings._default_config_files)
+                         self.settings.default_config_files)
 
     def test_has_config_files_list_can_be_changed(self):
         self.settings.config_files += ['./foo']
         self.assertEqual(self.settings.config_files,
-                         self.settings._default_config_files + ['./foo'])
+                         self.settings.default_config_files + ['./foo'])
 
     def test_loads_config_files(self):
 
@@ -270,7 +268,7 @@ foo = yeehaa
 
         self.settings.string(['foo'], 'foo help')
         self.settings.config_files = ['whatever.conf']
-        self.settings.load_configs(open=mock_open)
+        self.settings.load_configs(open_file=mock_open)
         self.assertEqual(self.settings['foo'], 'yeehaa')
 
     def test_loads_string_list_from_config_files(self):
@@ -285,7 +283,7 @@ bar = ping, pong
         self.settings.string_list(['foo'], 'foo help')
         self.settings.string_list(['bar'], 'bar help')
         self.settings.config_files = ['whatever.conf']
-        self.settings.load_configs(open=mock_open)
+        self.settings.load_configs(open_file=mock_open)
         self.assertEqual(self.settings['foo'], ['yeehaa'])
         self.assertEqual(self.settings['bar'], ['ping', 'pong'])
 
@@ -299,7 +297,7 @@ bar = ping, pong
         self.settings.string(['foo'], 'foo help', default='foo')
         self.settings.string_list(['bar'], 'bar help', default=['bar'])
         self.settings.config_files = ['whatever.conf']
-        self.settings.load_configs(open=mock_open)
+        self.settings.load_configs(open_file=mock_open)
         self.assertEqual(self.settings['foo'], 'foo')
         self.assertEqual(self.settings['bar'], ['bar'])
 
@@ -315,7 +313,7 @@ bar = ping, pong
         self.settings.string(['foo'], 'foo help', default='foo')
         self.settings.string_list(['bar'], 'bar help', default=['bar'])
         self.settings.config_files = ['whatever.conf']
-        self.settings.load_configs(open=mock_open)
+        self.settings.load_configs(open_file=mock_open)
         self.assertEqual(self.settings['foo'], 'yeehaa')
         self.assertEqual(self.settings['bar'], ['ping', 'pong'])
 
@@ -331,7 +329,7 @@ bar = ping, pong
         self.settings.string(['foo'], 'foo help', default='foo')
         self.settings.string_list(['bar'], 'bar help', default=['bar'])
         self.settings.config_files = ['whatever.conf']
-        self.settings.load_configs(open=mock_open)
+        self.settings.load_configs(open_file=mock_open)
         self.settings.parse_args(['--foo=red', '--bar=blue', '--bar=white'])
         self.assertEqual(self.settings['foo'], 'red')
         self.assertEqual(self.settings['bar'], ['blue', 'white'])
@@ -347,19 +345,19 @@ unknown = variable
         self.assertRaises(
             cliapp.UnknownConfigVariable,
             self.settings.load_configs,
-            open=mock_open)
+            open_file=mock_open)
 
     def test_load_configs_ignore_errors_opening_a_file(self):
 
         def mock_open(filename, mode=None):
             raise IOError()
 
-        self.assertEqual(self.settings.load_configs(open=mock_open), None)
+        self.assertEqual(self.settings.load_configs(open_file=mock_open), None)
 
     def test_adds_config_file_with_dash_dash_config(self):
         self.settings.parse_args(['--config=foo.conf'])
         self.assertEqual(self.settings.config_files,
-                         self.settings._default_config_files + ['foo.conf'])
+                         self.settings.default_config_files + ['foo.conf'])
 
     def test_ignores_default_configs(self):
         self.settings.parse_args(['--no-default-configs'])
@@ -444,7 +442,7 @@ bar = dodo
 
         self.settings.string(['foo'], 'foo help', default='foo')
         self.settings.config_files = ['whatever.conf']
-        self.settings.load_configs(open=mock_open)
+        self.settings.load_configs(open_file=mock_open)
         cp = self.settings.as_cp()
 
         self.assertEqual(sorted(cp.sections()), ['config', 'other'])