[py-svn] r37449 - py/trunk/py/doc

[hpk at codespeak.net]

Author: hpk
Date: Sat Jan 27 21:11:26 2007
New Revision: 37449

Modified:
   py/trunk/py/doc/conftest.py
Log:
fix failures in case of docutils not being installed 
(related to importing 'py.__.rest.directive')


Modified: py/trunk/py/doc/conftest.py
==============================================================================
--- py/trunk/py/doc/conftest.py	(original)
+++ py/trunk/py/doc/conftest.py	Sat Jan 27 21:11:26 2007
@@ -1,7 +1,6 @@
 from __future__ import generators
 import py
 from py.__.misc import rest 
-from py.__.rest import directive
 
 Option = py.test.config.Option 
 option = py.test.config.addoptions("documentation check options", 
@@ -15,11 +14,18 @@
         )
 ) 
 
+_initialized = False
 def checkdocutils(): 
+    global _initialized
     try:
         import docutils
     except ImportError:
         py.test.skip("docutils not importable")
+    if not _initialized:
+        from py.__.rest import directive
+        directive.register_linkrole('api', resolve_linkrole)
+        directive.register_linkrole('source', resolve_linkrole)
+        _initialized = True
 
 def restcheck(path):
     localpath = path
@@ -251,6 +257,4 @@
         else:
             relpath += '.html'
         return text, '../../apigen/source/%s' % (relpath,)
-directive.register_linkrole('api', resolve_linkrole)
-directive.register_linkrole('source', resolve_linkrole)