test suite fixes

sphinx/websupport/__init__.py

@@ -19,6 +19,7 @@ from jinja2 import Environment, FileSystemLoader
 from docutils.core import publish_parts
 
 from sphinx.application import Sphinx
+from sphinx.locale import _
 from sphinx.util.osutil import ensuredir
 from sphinx.util.jsonimpl import dumps as dump_json
 from sphinx.util.pycompat import htmlescape
@@ -217,6 +218,7 @@ class WebSupport(object):
             'search_performed': True,
             'search_results': results,
             'docroot': '../', # XXX
+            '_': _,
         }
         document = {
             'body': self.results_template.render(ctx),

tests/test_autodoc.py

@@ -13,7 +13,8 @@
 import sys
 from StringIO import StringIO
 
-from util import TestApp, Struct
+# "raises" imported for usage by autodoc
+from util import TestApp, Struct, raises
 from nose.tools import with_setup
 
 from docutils.statemachine import ViewList