Fixes for errors after conflict resolution. Refs #6677

mantidproject · Mar 15, 2013 · e823559 · e823559
1 parent 9f9c6cf
commit e823559
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Code/Mantid/Build/wiki_maker.py b/Code/Mantid/Build/wiki_maker.py
@@ -6,6 +6,7 @@
 import os
 import ConfigParser
 import sys
+import re
 import wiki_tools
 from wiki_tools import *
 from wiki_report import WikiReporter

diff --git a/Code/Mantid/Build/wiki_tools.py b/Code/Mantid/Build/wiki_tools.py
@@ -117,8 +117,10 @@ def create_function_signature(alg, algo_name):
     """
     create the function signature for the algorithm.
     """
-    from mantid.simpleapi import _get_function_spec
     import mantid.simpleapi
+    from mantid.api IWorkspaceProperty
+    from mantid.simpleapi import _get_function_spec
+
     _alg = getattr(mantid.simpleapi, algo_name)
     prototype =  algo_name + _get_function_spec(_alg)