[py-svn] commit/pytest: hpk42: back out accidental changes introduced by last patch
Bitbucket
commits-noreply at bitbucket.org
Tue Sep 25 15:14:04 CEST 2012
1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/a5f4cbe6a5a5/
changeset: a5f4cbe6a5a5
user: hpk42
date: 2012-09-25 15:13:58
summary: back out accidental changes introduced by last patch
affected #: 1 file
diff -r 9f3ba4c42151726a208dd4541288817edfb6cf44 -r a5f4cbe6a5a5c8ca70c7409f93ea00463f9855b8 _pytest/python.py
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -19,10 +19,8 @@
return function
class SetupMarker:
- def __init__(self, scope, enabled):
+ def __init__(self, scope):
self.scope = scope
- self.enabled = enabled
-
def __call__(self, function):
function._pytestsetup = self
return function
@@ -38,17 +36,14 @@
"""
return FactoryMarker(scope, params)
-def setup(scope="function", enabled=None):
+def setup(scope="function"):
""" return a decorator to mark functions as setup functions.
:arg scope: the scope for which the setup function will be active, one
of "function", "class", "module", "session".
Defaults to "function".
- :arg enabled: if a callable is specified, enabled(node) will be called
- and if it returns a false value this setup function
- will not be called and its funcargs will not be setup.
"""
- return SetupMarker(scope, enabled)
+ return SetupMarker(scope)
def cached_property(f):
"""returns a cached property that is calculated by function f.
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the pytest-commit
mailing list