1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/commits/66efe3231c7b/
Changeset: 66efe3231c7b
User: flub
Date: 2014-04-02 18:16:37
Summary: Style fixes for pep8
Includes a quotation change for consistent style.
Affected #: 1 file
diff -r e3309a39fb919391d0e9d9cb0e7fc7e75b7162e7 -r
66efe3231c7bdb6316d9e0fcd9f76f36d1063d06 _pytest/assertion/__init__.py
--- a/_pytest/assertion/__init__.py
+++ b/_pytest/assertion/__init__.py
@@ -6,20 +6,32 @@
from _pytest.monkeypatch import monkeypatch
from _pytest.assertion import util
+
def pytest_addoption(parser):
group = parser.getgroup("debugconfig")
- group.addoption('--assert', action="store", dest="assertmode",
+ group.addoption('--assert',
+ action="store",
+ dest="assertmode",
choices=("rewrite", "reinterp", "plain",),
- default="rewrite", metavar="MODE",
- help="""control assertion debugging tools.
-'plain' performs no assertion debugging.
-'reinterp' reinterprets assert statements after they failed to provide
assertion expression information.
-'rewrite' (the default) rewrites assert statements in test modules on import
-to provide assert expression information. """)
- group.addoption('--no-assert', action="store_true", default=False,
- dest="noassert", help="DEPRECATED equivalent to --assert=plain")
- group.addoption('--nomagic', '--no-magic', action="store_true",
- default=False, help="DEPRECATED equivalent to --assert=plain")
+ default="rewrite",
+ metavar="MODE",
+ help="""control assertion debugging tools. 'plain'
+ performs no assertion debugging. 'reinterp'
+ reinterprets assert statements after they failed
+ to provide assertion expression information.
+ 'rewrite' (the default) rewrites assert
+ statements in test modules on import to
+ provide assert expression information. """)
+ group.addoption('--no-assert',
+ action="store_true",
+ default=False,
+ dest="noassert",
+ help="DEPRECATED equivalent to --assert=plain")
+ group.addoption('--nomagic', '--no-magic',
+ action="store_true",
+ default=False,
+ help="DEPRECATED equivalent to --assert=plain")
+
class AssertionState:
"""State for the assertion plugin."""
@@ -28,6 +40,7 @@
self.mode = mode
self.trace = config.trace.root.get("assertion")
+
def pytest_configure(config):
mode = config.getvalue("assertmode")
if config.getvalue("noassert") or config.getvalue("nomagic"):
@@ -41,7 +54,7 @@
# Both Jython and CPython 2.6.0 have AST bugs that make the
# assertion rewriting hook malfunction.
if (sys.platform.startswith('java') or
- sys.version_info[:3] == (2, 6, 0)):
+ sys.version_info[:3] == (2, 6, 0)):
mode = "reinterp"
if mode != "plain":
_load_modules(mode)
@@ -58,11 +71,13 @@
config._assertstate.hook = hook
config._assertstate.trace("configured with mode set to %r" % (mode,))
+
def pytest_unconfigure(config):
hook = config._assertstate.hook
if hook is not None and hook in sys.meta_path:
sys.meta_path.remove(hook)
+
def pytest_collection(session):
# this hook is only called when test modules are collected
# so for example not in the master process of pytest-xdist
@@ -71,11 +86,11 @@
if hook is not None:
hook.set_session(session)
+
def pytest_runtest_setup(item):
def callbinrepr(op, left, right):
hook_result = item.ihook.pytest_assertrepr_compare(
config=item.config, op=op, left=left, right=right)
-
for new_expl in hook_result:
if new_expl:
# Don't include pageloads of data unless we are very
@@ -84,7 +99,7 @@
and item.config.option.verbose < 2):
new_expl[1:] = [py.builtin._totext(
'Detailed information truncated, use "-vv" to show')]
- res = py.builtin._totext('\n~').join(new_expl)
+ res = py.builtin._totext("\n~").join(new_expl)
if item.config.getvalue("assertmode") == "rewrite":
# The result will be fed back a python % formatting
# operation, which will fail if there are extraneous
@@ -93,14 +108,17 @@
return res
util._reprcompare = callbinrepr
+
def pytest_runtest_teardown(item):
util._reprcompare = None
+
def pytest_sessionfinish(session):
hook = session.config._assertstate.hook
if hook is not None:
hook.session = None
+
def _load_modules(mode):
"""Lazily import assertion related code."""
global rewrite, reinterpret
@@ -108,6 +126,7 @@
if mode == "rewrite":
from _pytest.assertion import rewrite # noqa
+
def warn_about_missing_assertion(mode):
try:
assert False
@@ -121,8 +140,9 @@
specifically = "failing tests may report as passing"
sys.stderr.write("WARNING: " + specifically +
- " because assert statements are not executed "
- "by the underlying Python interpreter "
- "(are you using python -O?)\n")
+ " because assert statements are not executed "
+ "by the underlying Python interpreter "
+ "(are you using python -O?)\n")
+
pytest_assertrepr_compare = util.assertrepr_compare
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.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
