From 5823ffcff8fad75967f20a31677f5ebaee8f9709 Mon Sep 17 00:00:00 2001 From: Alex Buts Date: Mon, 15 Dec 2014 17:27:24 +0000 Subject: [PATCH] Re #10803 Tests with new package location --- Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py | 2 +- Code/Mantid/scripts/test/DirectPropertyManagerTest.py | 2 +- Code/Mantid/scripts/test/DirectReductionHelpersTest.py | 2 +- Code/Mantid/scripts/test/MariReduction.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py index 4d1f7b2fa4f4..74d8f76ea327 100644 --- a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py +++ b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py @@ -104,7 +104,7 @@ import CommonFunctions as common import diagnostics -from Direct.DirectPropertyManager import DirectPropertyManager; +from DirectPropertyManager import DirectPropertyManager; def setup_reducer(inst_name,reload_instrument=False): """ diff --git a/Code/Mantid/scripts/test/DirectPropertyManagerTest.py b/Code/Mantid/scripts/test/DirectPropertyManagerTest.py index e18e9fa03472..7fcc75e2ad29 100644 --- a/Code/Mantid/scripts/test/DirectPropertyManagerTest.py +++ b/Code/Mantid/scripts/test/DirectPropertyManagerTest.py @@ -5,7 +5,7 @@ import numpy as np import os import sys -from DirectPropertyManager import DirectPropertyManager +from Direct.DirectPropertyManager import DirectPropertyManager #----------------------------------------------------------------------------------------------------------------------------------------- diff --git a/Code/Mantid/scripts/test/DirectReductionHelpersTest.py b/Code/Mantid/scripts/test/DirectReductionHelpersTest.py index 8ac2d34887dd..67f6c0b6f675 100644 --- a/Code/Mantid/scripts/test/DirectReductionHelpersTest.py +++ b/Code/Mantid/scripts/test/DirectReductionHelpersTest.py @@ -1,7 +1,7 @@ from mantid.simpleapi import * from mantid import api import unittest -import DirectReductionHelpers as helpers +import Direct.DirectReductionHelpers as helpers class DirectReductionHelpersTest(unittest.TestCase): diff --git a/Code/Mantid/scripts/test/MariReduction.py b/Code/Mantid/scripts/test/MariReduction.py index b0f9028f942c..891d28f2ec58 100644 --- a/Code/Mantid/scripts/test/MariReduction.py +++ b/Code/Mantid/scripts/test/MariReduction.py @@ -1,6 +1,6 @@ """ Sample MARI reduction scrip used in testing ReductionWrapper """ -from ReductionWrapper import * +from Direct.ReductionWrapper import * try: import reduce_vars as rv except: