Simple pylint fixes. Refs #11508

mantidproject · May 1, 2015 · ec2167e · ec2167e
1 parent 80f37dc
commit ec2167e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
@@ -9,10 +9,12 @@
 
 class ValidateInstrumentDefinitionFiles(stresstesting.MantidStressTest):
 
+    xsdFile=''
+
     def skipTests(self):
         try:
-            import genxmlif
-            import minixsv
+            from genxmlif import GenXmlIfError
+            from minixsv import pyxsval
         except ImportError:
             return True
         return False
@@ -32,8 +34,6 @@ def __getDataFileList__(self):
 
     def runTest(self):
         """Main entry point for the test suite"""
-        from genxmlif import GenXmlIfError
-        from minixsv import pyxsval
 
         # need to extend minixsv library to add method for that forces it to
         # validate against local schema when the xml file itself has
@@ -95,3 +95,4 @@ def parseAndValidateXmlInputForceReadFile(inputFile, xsdFile=None, **kw):
 
     valid = ValidateInstrumentDefinitionFiles()
     valid.runTest()
+
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
@@ -8,10 +8,12 @@
 
 class ValidateParameterFiles(stresstesting.MantidStressTest):
 
+    xsdFile=''
+
     def skipTests(self):
         try:
-            import genxmlif
-            import minixsv
+            from genxmlif import GenXmlIfError
+            from minixsv import pyxsval
         except ImportError:
             return True
         return False
@@ -31,8 +33,6 @@ def __getDataFileList__(self):
 
     def runTest(self):
         """Main entry point for the test suite"""
-        from genxmlif import GenXmlIfError
-        from minixsv import pyxsval
         direc = config['instrumentDefinition.directory']
         print direc
         self.xsdFile =  os.path.join(direc,'Schema/ParameterFile/1.0/','ParameterFileSchema.xsd')
@@ -62,6 +62,6 @@ def runTest(self):
             print "Succesfully Validated %d files" % len(files)
 
 if __name__ == '__main__':
-
     valid = ValidateParameterFiles()
-    valid.runTest()
+    valid.runTest()
+