diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2017-08-17 18:09:57 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2017-08-17 23:03:42 +0200 |
| commit | 3b372355f0d8e6799abc29f149ee479a0b89095e (patch) | |
| tree | 5ab17102e9983e0eda9dbad904883984aa128ead | |
| parent | 92606b5f9f881cf29a7d57210c57fe6ec6dc85e8 (diff) | |
| download | bcfg2-3b372355f0d8e6799abc29f149ee479a0b89095e.tar.gz bcfg2-3b372355f0d8e6799abc29f149ee479a0b89095e.tar.bz2 bcfg2-3b372355f0d8e6799abc29f149ee479a0b89095e.zip | |
testsuite: Bump pylint version for Python3
| -rw-r--r-- | testsuite/ext/pylint_compat.py | 7 | ||||
| -rw-r--r-- | testsuite/ext/ssl_protocols.py | 2 | ||||
| -rwxr-xr-x | testsuite/install.sh | 5 |
3 files changed, 12 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: diff --git a/testsuite/install.sh b/testsuite/install.sh index 758d5bdf8..01c5199f2 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -18,6 +18,11 @@ else pip_wheel unittest2 else pip_wheel -r testsuite/requirements.txt + + if [[ ${PYVER:0:1} == "3" ]]; then + # TODO: Move to "requirements.txt" if all the new errors are fixed. + pip_wheel 'pylint>1.4' + fi fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then |