1 new commit in pytest: https://bitbucket.org/hpk42/pytest/commits/a4ad4a06149f/ changeset: a4ad4a06149f user: flub date: 2013-02-15 14:38:40 summary: Use py.builtin._basestring affected #: 1 file
diff -r 57bc9ef8f9355784cc8a2a06da727c20bee52c95 -r a4ad4a06149f957d921d1f9a4e33ed88ddf7cf07 _pytest/skipping.py --- a/_pytest/skipping.py +++ b/_pytest/skipping.py @@ -3,12 +3,6 @@ import py, pytest import sys -# Provide basestring in python3 -try: - basestring = basestring -except NameError: - basestring = str - def pytest_addoption(parser): group = parser.getgroup("general") group.addoption('--runxfail', @@ -92,7 +86,7 @@ self.result = False for expr in self.holder.args: self.expr = expr - if isinstance(expr, basestring): + if isinstance(expr, py.builtin._basestring): result = cached_eval(self.item.config, expr, d) else: pytest.fail("expression is not a string") 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 http://mail.python.org/mailman/listinfo/pytest-commit