From 5df4128e8d554225fae72d81148321f0609f158b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:13 +0200 Subject: [PATCH 01/11] Update pep8-naming from 0.6.1 to 0.7.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index cbe996ce4..0c33cb700 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -18,7 +18,7 @@ flake8-tidy-imports==1.1.0 flake8-tuple==0.2.13 mccabe==0.6.1 pathmatch==0.2.1 -pep8-naming==0.6.1 +pep8-naming==0.7.0 pycodestyle==2.3.1 # rq.filter: < 2.4.0 pydocstyle==2.1.1 pyflakes==1.6.0 From 5ec3f1949a48eb172ce0a376bdf017b621412adc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:14 +0200 Subject: [PATCH 02/11] Update pyflakes from 1.6.0 to 2.0.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 0c33cb700..879f24cd0 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -21,7 +21,7 @@ pathmatch==0.2.1 pep8-naming==0.7.0 pycodestyle==2.3.1 # rq.filter: < 2.4.0 pydocstyle==2.1.1 -pyflakes==1.6.0 +pyflakes==2.0.0 six==1.11.0 snowballstemmer==1.2.1 typing==3.6.4 From e7a779ef90c90194cf725037d3a44c7af72e5d57 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:16 +0200 Subject: [PATCH 03/11] Update setuptools from 39.1.0 to 39.2.0 --- misc/requirements/requirements-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt index 34dc41d4d..64b096747 100644 --- a/misc/requirements/requirements-pip.txt +++ b/misc/requirements/requirements-pip.txt @@ -3,6 +3,6 @@ appdirs==1.4.3 packaging==17.1 pyparsing==2.2.0 -setuptools==39.1.0 +setuptools==39.2.0 six==1.11.0 wheel==0.31.1 From 9dc9ec34355a0df6a084a5e3747ac119006435bb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:17 +0200 Subject: [PATCH 04/11] Update astroid from 1.6.3 to 1.6.4 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 28add7741..cb2b70c8f 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -1,6 +1,6 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -astroid==1.6.3 +astroid==1.6.4 certifi==2018.4.16 chardet==3.0.4 github3.py==1.1.0 From f60c42b7fb46822d575740472f7b0b33c06fb217 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:19 +0200 Subject: [PATCH 05/11] Update pylint from 1.8.4 to 1.9.1 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index cb2b70c8f..55036ec8d 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -8,7 +8,7 @@ idna==2.6 isort==4.3.4 lazy-object-proxy==1.3.1 mccabe==0.6.1 -pylint==1.8.4 +pylint==1.9.1 python-dateutil==2.7.3 ./scripts/dev/pylint_checkers requests==2.18.4 From 725a133b9a17dbb9c946d1c0a4366a832e1bcedf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:20 +0200 Subject: [PATCH 06/11] Update cheroot from 6.2.4 to 6.3.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index cddf48309..e41caa1c8 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -2,7 +2,7 @@ attrs==18.1.0 beautifulsoup4==4.6.0 -cheroot==6.2.4 +cheroot==6.3.1 click==6.7 # colorama==0.3.9 coverage==4.5.1 From 616371a3c1ec768a225a4fe6a91cc6ad10e310ec Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:22 +0200 Subject: [PATCH 07/11] Update hypothesis from 3.56.9 to 3.57.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index e41caa1c8..5c8257cb1 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -11,7 +11,7 @@ fields==5.0.0 Flask==1.0.2 glob2==0.6 hunter==2.0.2 -hypothesis==3.56.9 +hypothesis==3.57.0 itsdangerous==0.24 # Jinja2==2.10 Mako==1.0.7 From 7596dbdd437f21f7c1fc4cda58efb25d000cdd12 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:23 +0200 Subject: [PATCH 08/11] Update pytest-instafail from 0.3.0 to 0.4.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 5c8257cb1..5191cece0 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -27,7 +27,7 @@ pytest-bdd==2.21.0 pytest-benchmark==3.1.1 pytest-cov==2.5.1 pytest-faulthandler==1.5.0 -pytest-instafail==0.3.0 +pytest-instafail==0.4.0 pytest-mock==1.10.0 pytest-qt==2.3.1 pytest-repeat==0.4.1 From c551e29f4c299e6dd55f2dfba09f82df9e8710ed Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:25 +0200 Subject: [PATCH 09/11] Update pytest-qt from 2.3.1 to 2.3.2 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 5191cece0..a2d4df525 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -29,7 +29,7 @@ pytest-cov==2.5.1 pytest-faulthandler==1.5.0 pytest-instafail==0.4.0 pytest-mock==1.10.0 -pytest-qt==2.3.1 +pytest-qt==2.3.2 pytest-repeat==0.4.1 pytest-rerunfailures==4.0 pytest-travis-fold==1.3.0 From 228c86c79901e6fccba1761a279d6bf0bb1c857e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 May 2018 18:53:26 +0200 Subject: [PATCH 10/11] Update virtualenv from 15.2.0 to 16.0.0 --- misc/requirements/requirements-tox.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index f5344f57e..e8b3de2b1 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -4,4 +4,4 @@ pluggy==0.6.0 py==1.5.3 six==1.11.0 tox==3.0.0 -virtualenv==15.2.0 +virtualenv==16.0.0 From 89f019b7105c7bb3ef7179942ebb1382f06c3fbd Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 21 May 2018 20:03:18 +0200 Subject: [PATCH 11/11] Remove unneeded "except ... as e:" assignments --- qutebrowser/browser/commands.py | 2 +- qutebrowser/browser/qutescheme.py | 2 +- qutebrowser/config/configdata.py | 2 +- qutebrowser/config/configfiles.py | 2 +- qutebrowser/config/configtypes.py | 2 +- qutebrowser/misc/crashdialog.py | 2 +- qutebrowser/misc/ipc.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 60844029f..1674a7eb0 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1674,7 +1674,7 @@ class CommandDispatcher: """ try: elem.set_value(text) - except webelem.OrphanedError as e: + except webelem.OrphanedError: message.error('Edited element vanished') ed.backup() except webelem.Error as e: diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 8866f1643..6fc2a8429 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -177,7 +177,7 @@ def data_for_url(url): except OSError as e: # FIXME:qtwebengine how to handle this? raise QuteSchemeOSError(e) - except QuteSchemeError as e: + except QuteSchemeError: raise assert mimetype is not None, url diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index c617fca14..e9b33b5b8 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -102,7 +102,7 @@ def _parse_yaml_type(name, node): try: typ = getattr(configtypes, type_name) - except AttributeError as e: + except AttributeError: raise AttributeError("Did not find type {} for {}".format( type_name, name)) diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 986ca3f56..25c0c9971 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -573,7 +573,7 @@ def read_autoconfig(): """Read the autoconfig.yml file.""" try: config.instance.read_yaml() - except configexc.ConfigFileErrors as e: + except configexc.ConfigFileErrors: raise # caught in outer block except configexc.Error as e: desc = configexc.ConfigErrorDesc("Error", e) diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py index ecf1efe86..619dfd71d 100644 --- a/qutebrowser/config/configtypes.py +++ b/qutebrowser/config/configtypes.py @@ -1409,7 +1409,7 @@ class SearchEngineUrl(BaseType): try: value.format("") - except (KeyError, IndexError) as e: + except (KeyError, IndexError): raise configexc.ValidationError( value, "may not contain {...} (use {{ and }} for literal {/})") except ValueError as e: diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 4d395b8ec..85fdf33bf 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -293,7 +293,7 @@ class _CrashDialog(QDialog): self._paste_text = '\n\n'.join(lines) try: user = getpass.getuser() - except Exception as e: + except Exception: log.misc.exception("Error while getting user") user = 'unknown' try: diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py index 8af5ba6bf..3c718de7b 100644 --- a/qutebrowser/misc/ipc.py +++ b/qutebrowser/misc/ipc.py @@ -498,7 +498,7 @@ def send_or_listen(args): server = IPCServer(socketname) server.listen() return server - except AddressInUseError as e: + except AddressInUseError: # This could be a race condition... log.init.debug("Got AddressInUseError, trying again.") time.sleep(0.5)