summaryrefslogtreecommitdiff
path: root/pytest.py
diff options
context:
space:
mode:
authorRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2017-06-11 12:27:16 +0200
committerRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2017-06-11 12:27:16 +0200
commit6be57a3711465c70b3cb4e5ddf5ee373608f6fbf (patch)
tree7b243c1a211e98875c5cd49d64115c873a519873 /pytest.py
parent36251e0db473d2d42d602ee759a80eb6f1d80dfc (diff)
downloadpytest-6be57a3711465c70b3cb4e5ddf5ee373608f6fbf.tar.gz
move python api helpers out of the python module
this separates exposed normal api from collection elements
Diffstat (limited to 'pytest.py')
-rw-r--r--pytest.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pytest.py b/pytest.py
index e3c72023c..da6b64910 100644
--- a/pytest.py
+++ b/pytest.py
@@ -22,11 +22,10 @@ from _pytest.skipping import xfail
from _pytest.main import Item, Collector, File, Session
from _pytest.fixtures import fillfixtures as _fillfuncargs
from _pytest.python import (
- raises,
Module, Class, Instance, Function, Generator,
)
-from _pytest.python_api import approx
+from _pytest.python_api import approx, raises
set_trace = __pytestPDB.set_trace