Fix import errors in make docs

docs/conf.py

@@ -6,12 +6,21 @@
 import re
 import sys
 
+from pkg_resources import require
+require('mock')
+from mock import MagicMock
+
+# Mock out failing imports
+MOCK_MODULES = ["tornado", "tornado.websocket", "tornado.websocket",
+                "tornado.web", "tornado.httpserver", "tornado.ioloop",
+                "cothread", "scanpointgenerator"]
+sys.modules.update((mod_name, MagicMock()) for mod_name in MOCK_MODULES)
+
 sys.path.append(os.path.dirname(__file__))
 from generate_api_docs import generate_docs
 
 generate_docs()  # Generate api.rst
 
-
 def get_version():
     """
     Extracts the version number from the version.py file.

docs/dev/metas_api/scalarmeta.rst

@@ -1,7 +1,7 @@
 ScalarMeta
 ----------
 
-.. module:: malcolm.metas
+.. module:: malcolm.metas.scalarmeta
 
 .. autoclass:: ScalarMeta
     :members:

docs/dev/wscomms_api/wsservercomms.rst

@@ -1,7 +1,7 @@
 WSServerComms
 -------------
 
-.. module:: malcolm.wscomms.wservercomms
+.. module:: malcolm.wscomms.wsservercomms
 
 .. autoclass:: WSServerComms
     :members:

malcolm/wscomms/wsclientcomms.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 import json
 
+import tornado
 from tornado.ioloop import IOLoop
 from tornado.websocket import websocket_connect
 

malcolm/wscomms/wsservercomms.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 import json
 
+import tornado
 from tornado.websocket import WebSocketHandler
 from tornado.ioloop import IOLoop
 from tornado.web import Application