floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(antocuni, ronny around): import directly from _pytest.runner to avoid the usage of @property

This commit is contained in:
Antonio Cuni 2013-03-14 16:53:57 +01:00
parent 37c47155e0
commit ba0100e057
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_pytest/main.py
View File

@ -10,6 +10,7 @@ except ImportError:
from UserDict import DictMixin as MappingMixin from UserDict import DictMixin as MappingMixin
from _pytest.mark import MarkInfo from _pytest.mark import MarkInfo
import _pytest.runner
tracebackcutdir = py.path.local(_pytest.__file__).dirpath() tracebackcutdir = py.path.local(_pytest.__file__).dirpath()
@ -348,16 +349,9 @@ class Collector(Node):
and thus iteratively build a tree. and thus iteratively build a tree.
""" """
_skip_exceptions = None # the set of exceptions to interpret as "Skip the whole module" during
@property # collection
def skip_exceptions(self): skip_exceptions = (_pytest.runner.Skipped,)
if self._skip_exceptions is None:
return (py.test.skip.Exception,)
return self._skip_exceptions
@skip_exceptions.setter
def skip_exceptions(self, value):
self._skip_exceptions = value
class CollectError(Exception): class CollectError(Exception):
""" an error during collection, contains a custom message. """ """ an error during collection, contains a custom message. """