summaryrefslogtreecommitdiffstats
path: root/testsuite/ext
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/ext')
-rw-r--r--testsuite/ext/pylint_compat.py7
-rw-r--r--testsuite/ext/ssl_protocols.py2
2 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/ext/pylint_compat.py b/testsuite/ext/pylint_compat.py
index 8ccfbc89b..5300df8e6 100644
--- a/testsuite/ext/pylint_compat.py
+++ b/testsuite/ext/pylint_compat.py
@@ -1,5 +1,10 @@
from pylint.__pkginfo__ import version as pylint_version
-from logilab.astng.__pkginfo__ import version as astng_version
+
+try:
+ from logilab.astng.__pkginfo__ import version as astng_version
+except ImportError:
+ from astroid.__pkginfo__ import version as astng_version
+
def register(linter):
if pylint_version < '0.24.0':
diff --git a/testsuite/ext/ssl_protocols.py b/testsuite/ext/ssl_protocols.py
index a56293669..f92e3e355 100644
--- a/testsuite/ext/ssl_protocols.py
+++ b/testsuite/ext/ssl_protocols.py
@@ -8,7 +8,7 @@ except ImportError:
def ssl_transform(module):
if module.name == 'ssl':
for proto in ('SSLv23', 'TLSv1'):
- module.locals['PROTOCOL_%s' % proto] = [node_classes.Const()]
+ module.locals['PROTOCOL_%s' % proto] = [node_classes.Const(0)]
def register(linter):
if PYLINT == 0: