summaryrefslogtreecommitdiff
path: root/_pytest/assertion
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2016-07-11 22:03:53 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2016-07-11 22:21:52 -0300
commit458ecae1df0ede57182db685e7b9b3b8f0c7a652 (patch)
tree4bd7050c5d1be2bdb2d76d4f9f20667667703ba2 /_pytest/assertion
parentad4125dc0d0c941f50ae42aa61663a3895a6fd9f (diff)
downloadpytest-458ecae1df0ede57182db685e7b9b3b8f0c7a652.tar.gz
Replace all usages of "pytest_funcarg__" for @pytest.fixture
Diffstat (limited to '_pytest/assertion')
-rw-r--r--_pytest/assertion/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/_pytest/assertion/__init__.py b/_pytest/assertion/__init__.py
index 4f28c8da7..dd30e1471 100644
--- a/_pytest/assertion/__init__.py
+++ b/_pytest/assertion/__init__.py
@@ -6,7 +6,7 @@ import os
import sys
from _pytest.config import hookimpl
-from _pytest.monkeypatch import monkeypatch
+from _pytest.monkeypatch import MonkeyPatch
from _pytest.assertion import util
@@ -56,7 +56,7 @@ def pytest_load_initial_conftests(early_config, parser, args):
if mode != "plain":
_load_modules(mode)
- m = monkeypatch()
+ m = MonkeyPatch()
early_config._cleanup.append(m.undo)
m.setattr(py.builtin.builtins, 'AssertionError',
reinterpret.AssertionError) # noqa