diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-03-21 07:13:07 +0100 |
|---|---|---|
| committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-03-29 17:52:01 +0200 |
| commit | 02315c04891fa04d7877761a9c85fd6ca47c49a6 (patch) | |
| tree | 6b08c67a48d7fc44d0fedbb0d26e08c7dd7a32f5 /_pytest | |
| parent | a92a51b01b261df5b8491c6b13784c982a5320ca (diff) | |
| download | pytest-02315c04891fa04d7877761a9c85fd6ca47c49a6.tar.gz | |
remove unnecessary of in the code figuring the fixture names
Diffstat (limited to '_pytest')
| -rw-r--r-- | _pytest/fixtures.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py index 457aa9d4f..27c2b2c5c 100644 --- a/_pytest/fixtures.py +++ b/_pytest/fixtures.py @@ -985,8 +985,7 @@ class FixtureManager(object): argnames = () usefixtures = flatten(uf_mark.args for uf_mark in node.find_markers("usefixtures")) initialnames = argnames - if usefixtures is not None: - initialnames = tuple(usefixtures) + initialnames + initialnames = tuple(usefixtures) + initialnames fm = node.session._fixturemanager names_closure, arg2fixturedefs = fm.getfixtureclosure(initialnames, node) |