Merge branch 'py3k'

1 files changed, 8 insertions, 6 deletions

diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index e6a530408..18632e316 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -6,11 +6,12 @@ __revision__ = '$Revision$'
 import sys
 import inspect
 import logging
-import ConfigParser
 import Bcfg2.Logger
 import Bcfg2.Options
 import Bcfg2.Server.Core
 import Bcfg2.Server.Lint
+# Compatibility imports
+from Bcfg2.Bcfg2Py3k import ConfigParser
 
 logger = logging.getLogger('bcfg2-lint')
 
@@ -29,7 +30,7 @@ class Parser(ConfigParser.ConfigParser):
 def run_serverless_plugins(plugins, config=None, setup=None):
     logger.debug("Running serverless plugins")
     errors = (0, 0)
-    for plugin_name, plugin in plugins.items():
+    for plugin_name, plugin in list(plugins.items()):
         plugin_errors = run_plugin(plugin, plugin_name,
                                    setup=setup, config=config, files=files)
         errors = [errors[n] + plugin_errors[n]
@@ -40,7 +41,7 @@ def run_server_plugins(plugins, config=None, setup=None):
     core = load_server(setup)
     logger.debug("Running server plugins")
     errors = (0, 0)
-    for plugin_name, plugin in plugins.items():
+    for plugin_name, plugin in list(plugins.items()):
         plugin_errors = run_plugin(plugin, plugin_name, args=[core],
                                    setup=setup, config=config, files=files)
         errors = [errors[n] + plugin_errors[n]
@@ -140,7 +141,8 @@ if __name__ == '__main__':
         except ImportError:
             try:
                 mod = __import__(plugin_name)
-            except Exception, err:
+            except Exception:
+                err = sys.exc_info()[1]
                 logger.error("Failed to load plugin %s: %s" % (plugin_name,
                                                                err))
                 raise SystemExit(1)
@@ -160,8 +162,8 @@ if __name__ == '__main__':
         errors = [errors[n] + perrors[n] for n in range(0, len(errors))]
 
     if errors[0] or errors[1] or setup['verbose']:
-        print "%d errors" % errors[0]
-        print "%d warnings" % errors[1]
+        print("%d errors" % errors[0])
+        print("%d warnings" % errors[1])
         
     if errors[0]:
         raise SystemExit(2)