From 653fbe81d037f9b70b49fb1bda58720481dc9b78 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 5 Dec 2014 12:46:57 +0100 Subject: [PATCH] pylint: Ignore distutils ImportError. See https://bitbucket.org/logilab/pylint/issue/73/ --- qutebrowser/utils/qtutils.py | 6 ++++-- scripts/init_venv.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py index 60f4c0f7a..7ed0939c6 100644 --- a/qutebrowser/utils/qtutils.py +++ b/qutebrowser/utils/qtutils.py @@ -30,7 +30,8 @@ Module attributes: import os import sys import operator -from distutils.version import StrictVersion as Version +import distutils.version # pylint: disable=no-name-in-module,import-error +# https://bitbucket.org/logilab/pylint/issue/73/ from PyQt5.QtCore import (qVersion, QEventLoop, QDataStream, QByteArray, QIODevice) @@ -54,7 +55,8 @@ def version_check(version, op=operator.ge): version: The version to check against. op: The operator to use for the check. """ - return op(Version(qVersion()), Version(version)) + return op(distutils.version.StrictVersion(qVersion()), + distutils.version.StrictVersion(version)) def check_overflow(arg, ctype, fatal=True): diff --git a/scripts/init_venv.py b/scripts/init_venv.py index fa78fb801..ee23a1102 100644 --- a/scripts/init_venv.py +++ b/scripts/init_venv.py @@ -28,7 +28,8 @@ import os.path import shutil import argparse import subprocess -import distutils.sysconfig +import distutils.sysconfig # pylint: disable=import-error +# see https://bitbucket.org/logilab/pylint/issue/73/ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir)) from scripts import utils