rename comments package storage

sphinx/websupport/__init__.py

@@ -19,7 +19,7 @@ from jinja2 import Environment, FileSystemLoader
 from sphinx.application import Sphinx
 from sphinx.util.osutil import ensuredir
 from sphinx.websupport.search import BaseSearch, search_adapters
-from sphinx.websupport.comments import StorageBackend
+from sphinx.websupport.storage import StorageBackend
 from sphinx.websupport.errors import *
 
 class WebSupportApp(Sphinx):
@@ -54,7 +54,7 @@ class WebSupport(object):
         else:
             # If a StorageBackend isn't provided, use the default
             # SQLAlchemy backend with an SQLite db.
-            from sphinx.websupport.comments.sqlalchemystorage \
+            from sphinx.websupport.storage.sqlalchemystorage \
                 import SQLAlchemyStorage
             from sqlalchemy import create_engine
             db_path = path.join(self.outdir, 'db', 'websupport.db')

tests/test_searchadapters.py

@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for details.
 """
 
-import os
+import os, sys
 from StringIO import StringIO
 
 from util import *

tests/test_websupport.py

@@ -14,10 +14,10 @@ from StringIO import StringIO
 
 from sphinx.websupport import WebSupport
 from sphinx.websupport.errors import *
-from sphinx.websupport.comments.differ import CombinedHtmlDiff
-from sphinx.websupport.comments.sqlalchemystorage import Session, \
+from sphinx.websupport.storage.differ import CombinedHtmlDiff
+from sphinx.websupport.storage.sqlalchemystorage import Session, \
     SQLAlchemyStorage
-from sphinx.websupport.comments.db import Node
+from sphinx.websupport.storage.db import Node
 from util import *
 
 try: