Merge branch 'master' into merge-master

2016-05-13 19:37:41 +02:00
parent c49863aa63 8a94c66e68
commit eab762ea99
9 changed files with 38 additions and 25 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1746,7 +1746,7 @@ class FixtureRequest(FuncargnamesCompatAttr):
        self._pyfuncitem = pyfuncitem
        #: fixture for which this request is being performed
        self.fixturename = None
-        #: Scope string, one of "function", "cls", "module", "session"
+        #: Scope string, one of "function", "class", "module", "session"
        self.scope = "function"
        self._funcargs  = {}
        self._fixturedefs = {}