X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FKERNEL_PY%2Fkernel%2Ftestdata.py;h=ffbb0dcc934b6d1b02c907c5aafa53a137695534;hb=ee1423ae556e68ac97fb6fa6c99978ff555c0ea8;hp=b69f370acf1cbc99f1cdd4eb52d79f926ae75197;hpb=0fac7040be417aab7228a4e23904b4cf22a8dda4;p=modules%2Fkernel.git diff --git a/src/KERNEL_PY/kernel/testdata.py b/src/KERNEL_PY/kernel/testdata.py index b69f370ac..ffbb0dcc9 100644 --- a/src/KERNEL_PY/kernel/testdata.py +++ b/src/KERNEL_PY/kernel/testdata.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -24,8 +24,8 @@ __author__="gboulant" __date__ ="$17 avr. 2010 19:44:36$" -from enumerate import Enumerate -from datamodeler import DataModeler, TypeString, TypeInteger +from .enumerate import Enumerate +from .datamodeler import DataModeler, TypeString, TypeInteger from salome.kernel import Callable class TestData(DataModeler): @@ -79,7 +79,7 @@ class TestData(DataModeler): # Basic use cases and unit tests # ============================================================================== # -from uiexception import UiException +from .uiexception import UiException def TEST_getName(): testdata = TestData() @@ -96,8 +96,8 @@ def TEST_useBadKey(): testdata.unknown = "unknown" # This should not arrive here return False - except UiException, err: - print err + except UiException as err: + print(err) return True def TEST_useBadType(): @@ -106,8 +106,8 @@ def TEST_useBadType(): testdata.TYPE = "unknown" # This should not arrive here return False - except UiException, err: - print err + except UiException as err: + print(err) return True def TEST_useBadRange(): @@ -117,17 +117,17 @@ def TEST_useBadRange(): testdata.TYPE = TestData.TYPES_LIST.SEP testdata.setType(TestData.TYPES_LIST.SEP) # This should arrive here - except UiException, err: + except UiException as err: # And not here - print err + print(err) return False try: testdata.TYPE = 9999 # a type that does not exist in the range # This should not arrive here return False - except UiException, err: - print err + except UiException as err: + print(err) return True def TEST_serialize(): @@ -136,7 +136,7 @@ def TEST_serialize(): ref_testdata.setName("The firts name") res_testdata = salome.kernel.unserialize(salome.kernel.serialize(ref_testdata)) - print res_testdata.getName() + print(res_testdata.getName()) if res_testdata.getName() != ref_testdata.getName(): return False @@ -144,14 +144,14 @@ def TEST_serialize(): # Is the unserialized data still functional? try: res_testdata.setName("An other name") - print res_testdata.getName() + print(res_testdata.getName()) except: - print e + print(e) return False return True if __name__ == "__main__": - from unittester import run + from .unittester import run run("salome/kernel/testdata","TEST_getName") run("salome/kernel/testdata","TEST_useBadKey") run("salome/kernel/testdata","TEST_useBadType")