diff --git a/docs/sphinxext/mantiddoc/directives/diagram.py b/docs/sphinxext/mantiddoc/directives/diagram.py index 2ae58bf405afd010544e691a801fa727ced7399f..863d8256ad46a40680288bd5b884f44ea71d6808 100644 --- a/docs/sphinxext/mantiddoc/directives/diagram.py +++ b/docs/sphinxext/mantiddoc/directives/diagram.py @@ -63,7 +63,7 @@ class DiagramDirective(BaseDirective): dot_executable = os.environ["DOT_EXECUTABLE"] except: self.add_rst(".. figure:: /images/ImageNotFound.png\n\n" + - " graphviz not found - diagram could not be rendered.") + " graphviz not found - diagram could not be rendered.") return [] #Make sure we have an output directory diff --git a/docs/sphinxext/mantiddoc/directives/properties.py b/docs/sphinxext/mantiddoc/directives/properties.py index eadfc9f6decae6a9978782cb08a24899ee83d478..0531ada285c35b0231d90c388590851163e635ad 100644 --- a/docs/sphinxext/mantiddoc/directives/properties.py +++ b/docs/sphinxext/mantiddoc/directives/properties.py @@ -32,14 +32,14 @@ class PropertiesDirective(AlgorithmBaseDirective): header = ('Name', 'Default', 'Description') for i in xrange(ifunc.numParams()): - properties.append(( - ifunc.parameterName(i), - str(ifunc.getParameterValue(i)), - ifunc.paramDescription(i) - )) + properties.append((ifunc.parameterName(i), + str(ifunc.getParameterValue(i)), + ifunc.paramDescription(i) + )) self.add_rst(self.make_header("Properties (fitting parameters)")) else: # this is an Algorithm - alg = self.create_mantid_algorithm(self.algorithm_name(), self.algorithm_version()) + alg = self.create_mantid_algorithm(self.algorithm_name(), + self.algorithm_version()) alg_properties = alg.getProperties() if len(alg_properties) == 0: return False @@ -99,7 +99,7 @@ class PropertiesDirective(AlgorithmBaseDirective): # Added 10 to the length to ensure if table_content is 0 that # the table is still displayed. col_sizes = [max( (len(row[i] * 10) + 10) for row in table_content) - for i in range(len(header_content))] + for i in range(len(header_content))] # Use the column widths as a means to formatting columns. formatter = ' '.join('{%d:<%d}' % (index,col) for index, col in enumerate(col_sizes)) diff --git a/docs/sphinxext/mantiddoc/directives/sourcelink.py b/docs/sphinxext/mantiddoc/directives/sourcelink.py index 1d75ba89c4775243cab7f01a4beb2c3f9c26efb5..f60bee49b5fc22ad5029399456c5cba1190f679b 100644 --- a/docs/sphinxext/mantiddoc/directives/sourcelink.py +++ b/docs/sphinxext/mantiddoc/directives/sourcelink.py @@ -112,12 +112,15 @@ class SourceLinkDirective(AlgorithmBaseDirective): suggested_path = "os_agnostic_path_to_file_from_source_root" if len(path_list) > 1: suggested_path = path_list[0].replace(self.source_root, "") - raise SourceLinkError("Found multiple possibilities for " + file_name + "." + extension + "\n" + - "Possible matches" + str(path_list) + "\n" + - "Specify one using the " + extension + " option\n" + - "e.g. \n" + - ".. sourcelink:\n" + - " :" + extension + ": " + suggested_path) + raise SourceLinkError("Found multiple possibilities for " + + file_name + "." + extension + "\n" + + "Possible matches" + str(path_list) + + "\n" + + "Specify one using the " + extension + + " option\n" + + "e.g. \n" + + ".. sourcelink:\n" + + " :" + extension + ": " + suggested_path) return self.file_lookup[file_name][extension] except KeyError: