fix python3 issues, add missing plugin docs

--HG--
branch : trunk

testing/path/conftest.py

@@ -17,7 +17,7 @@ def pytest_funcarg__repowc1(request):
     )
     for x in ('test_remove', 'test_move', 'test_status_deleted'):
         if request.function.__name__.startswith(x):
-            print >>sys.stderr, ("saving repo", repo, "for", request.function)
+            #print >>sys.stderr, ("saving repo", repo, "for", request.function)
             _savedrepowc = save_repowc(repo, wc) 
             request.addfinalizer(lambda: restore_repowc(_savedrepowc))
     return repo, repourl, wc
@@ -67,7 +67,7 @@ def save_repowc(repo, wc):
 
 def restore_repowc(obj):
     savedrepo, savedwc = obj
-    print >>sys.stderr, ("restoring", savedrepo)
+    #print >>sys.stderr, ("restoring", savedrepo)
     repo = savedrepo.new(basename=savedrepo.basename[:-2])
     assert repo.check()
     wc = savedwc.new(basename=savedwc.basename[:-2])

testing/plugin/test_pytest_restdoc.py

@@ -1,3 +1,4 @@
+import py
 from py.plugin.pytest_restdoc import deindent
 
 def test_deindent():
@@ -9,6 +10,9 @@ def test_deindent():
     assert deindent('  foo\n bar\n') == ' foo\nbar\n'
 
 class TestDoctest:
+    def setup_class(cls):
+        py.test.importorskip("docutils")
+
     def pytest_funcarg__testdir(self, request):
         testdir = request.getfuncargvalue("testdir")
         testdir.plugins.append("restdoc")