[Pytest-commit] commit/pytest: hpk42: fix tests on py32/py33

[commits-noreply]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/d22d342efe52/
Changeset:   d22d342efe52
User:        hpk42
Date:        2013-10-22 11:26:29
Summary:     fix tests on py32/py33
Affected #:  2 files

diff -r e8e4c19c61c73b5d741229e5caa55005e47d12c5 -r 
d22d342efe52cb03a7d2bbeea8554af122406bce _pytest/monkeypatch.py
--- a/_pytest/monkeypatch.py
+++ b/_pytest/monkeypatch.py
@@ -29,7 +29,7 @@
 
 def derive_importpath(import_path):
     import pytest
-    if not isinstance(import_path, basestring) or "." not in import_path:
+    if not isinstance(import_path, _basestring) or "." not in import_path:
         raise TypeError("must be absolute import path string, not %r" %
                         (import_path,))
     rest = []
@@ -116,7 +116,7 @@
         """
         __tracebackhide__ = True
         if name is notset:
-            if not isinstance(target, basestring):
+            if not isinstance(target, _basestring):
                 raise TypeError("use delattr(target, name) or "
                                 "delattr(target) with target being a dotted "
                                 "import string")

diff -r e8e4c19c61c73b5d741229e5caa55005e47d12c5 -r 
d22d342efe52cb03a7d2bbeea8554af122406bce testing/test_junitxml.py
--- a/testing/test_junitxml.py
+++ b/testing/test_junitxml.py
@@ -465,8 +465,9 @@
 def test_unicode_issue368(testdir):
     path = testdir.tmpdir.join("test.xml")
     log = LogXML(str(path), None)
+    ustr = py.builtin._totext("ВНИ!", "utf-8")
     class report:
-        longrepr = u"ВНИМАНИЕ!"
+        longrepr = ustr
         sections = []
         nodeid = "something"
 
@@ -477,9 +478,9 @@
     log.append_collect_failure(report)
     log.append_collect_skipped(report)
     log.append_error(report)
-    report.longrepr = "filename", 1, u"ВНИМАНИЕ!"
+    report.longrepr = "filename", 1, ustr
     log.append_skipped(report)
-    report.wasxfail = u"ВНИМАНИЕ!"
+    report.wasxfail = ustr
     log.append_skipped(report)
     log.pytest_sessionfinish()

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