diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 1061433a4..b260c5086 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -73,6 +73,7 @@ def read_file(filename, binary=False): Return: The file contents as string. """ + # pylint: disable=assignment-from-no-return if hasattr(sys, 'frozen'): # cx_Freeze doesn't support pkg_resources :( fn = os.path.join(os.path.dirname(sys.executable), filename) diff --git a/tox.ini b/tox.ini index ee847cafa..a04410975 100644 --- a/tox.ini +++ b/tox.ini @@ -105,8 +105,8 @@ passenv = deps = {[testenv]deps} {[testenv:misc]deps} - astroid==1.4.1 - pylint==1.5.1 + astroid==1.4.2 + pylint==1.5.2 requests==2.9.0 commands = {envpython} scripts/link_pyqt.py --tox {envdir}