Commits

holger krekel committed 859b37d

py3 fixes

Comments (0)

Files changed (3)

 
         content = " ".join(map(str, args))
         indent = "  " * self.indent
-        
+
         lines = [
             "%s%s [%s]\n" %(indent, content, ":".join(tags))
         ]
         #if str(e).find(name) == -1:
         #    raise
         pass #
-    __import__(importspec)
+    try:
+        __import__(importspec)
+    except ImportError:
+        raise ImportError(importspec)
     return sys.modules[importspec]
 
 class MultiCall:

testing/test_genscript.py

 
 
 def pytest_funcarg__standalone(request):
-    return request.cached_setup(scope="module", setup=lambda: Standalone(request))
+    return request.cached_setup(scope="module",
+        setup=lambda: Standalone(request))
 
 class Standalone:
     def __init__(self, request):

testing/test_runner.py

 
 def test_outcomeexception_exceptionattributes():
     outcome = runner.OutcomeException('test')
-    assert outcome.message == outcome.msg
+    assert outcome.args[0] == outcome.msg
 
 def test_pytest_exit():
     try:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.