From a1c4e6e2cfbcc1f88ac5ce8ddebc58fb272bc44a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 20 Jul 2016 16:13:46 +0200 Subject: [PATCH] Rename shadowed tmpdir variable --- tests/helpers/fixtures.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py index 016767214..0fd890fa0 100644 --- a/tests/helpers/fixtures.py +++ b/tests/helpers/fixtures.py @@ -414,11 +414,11 @@ def config_tmpdir(monkeypatch, tmpdir): Use this to avoid creating a 'real' config dir (~/.config/qute_test). """ - tmpdir = tmpdir / 'config' - path = str(tmpdir) + confdir = tmpdir / 'config' + path = str(confdir) os.mkdir(path) monkeypatch.setattr('qutebrowser.utils.standarddir.config', lambda: path) - return tmpdir + return confdir @pytest.fixture @@ -427,11 +427,11 @@ def data_tmpdir(monkeypatch, tmpdir): Use this to avoid creating a 'real' data dir (~/.local/share/qute_test). """ - tmpdir = tmpdir / 'data' - path = str(tmpdir) + datadir = tmpdir / 'data' + path = str(datadir) os.mkdir(path) monkeypatch.setattr('qutebrowser.utils.standarddir.data', lambda: path) - return tmpdir + return datadir @pytest.fixture