diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py index 1512c9cf0..52d7088e9 100644 --- a/_pytest/fixtures.py +++ b/_pytest/fixtures.py @@ -72,7 +72,8 @@ def scopeproperty(name=None, doc=None): def get_scope_package(node, fixturedef): - cls = node.Package + import pytest + cls = pytest.Package current = node fixture_package_name = os.path.join(fixturedef.baseid, '__init__.py') while current and (type(current) is not cls or diff --git a/_pytest/nodes.py b/_pytest/nodes.py index 33752064f..69ba9ac92 100644 --- a/_pytest/nodes.py +++ b/_pytest/nodes.py @@ -116,7 +116,6 @@ class Node(object): Function = _CompatProperty("Function") File = _CompatProperty("File") Item = _CompatProperty("Item") - Package = _CompatProperty("Package") def _getcustomclass(self, name): maybe_compatprop = getattr(type(self), name)