Merge branch 'maint'

Conflicts:
	doc/appendix/guides/fedora.txt
	misc/bcfg2.spec
	schemas/types.xsd
	src/lib/Bcfg2/Encryption.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Client.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
	testsuite/common.py
	testsuite/install.sh

1 files changed, 22 insertions, 8 deletions

diff --git a/testsuite/ext/exception_messages.py b/testsuite/ext/exception_messages.py
index 877ba42a1..cd3d7112c 100644
--- a/testsuite/ext/exception_messages.py
+++ b/testsuite/ext/exception_messages.py
@@ -1,16 +1,30 @@
-from logilab import astng
-from pylint.interfaces import IASTNGChecker
+try:
+    from logilab import astng as ast
+    from pylint.interfaces import IASTNGChecker as IChecker
+    PYLINT = 0  # pylint 0.something
+except ImportError:
+    import astroid as ast
+    from pylint.interfaces import IAstroidChecker as IChecker
+    PYLINT = 1  # pylint 1.something
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import safe_infer
 
+if PYLINT == 0:
+    # this is not quite correct; later versions of pylint 0.* wanted a
+    # three-tuple for messages as well
+    msg = ('Exception raised without arguments',
+           'Used when an exception is raised without any arguments')
+else:
+    msg = ('Exception raised without arguments',
+           'exception-without-args',
+           'Used when an exception is raised without any arguments')
+msgs = {'R9901': msg}
+
 
 class ExceptionMessageChecker(BaseChecker):
-    __implements__ = IASTNGChecker
+    __implements__ = IChecker
 
     name = 'Exception Messages'
-    msgs = \
-        {'R9901': ('Exception raised without arguments',
-                   'Used when an exception is raised without any arguments')}
     options = (
         ('exceptions-without-args',
          dict(default=('NotImplementedError',),
@@ -23,9 +37,9 @@ class ExceptionMessageChecker(BaseChecker):
     def visit_raise(self, node):
         if node.exc is None:
             return
-        if isinstance(node.exc, astng.Name):
+        if isinstance(node.exc, ast.Name):
             raised = safe_infer(node.exc)
-            if (isinstance(raised, astng.Class) and
+            if (isinstance(raised, ast.Class) and
                 raised.name not in self.config.exceptions_without_args):
                 self.add_message('R9901', node=node.exc)