X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMEDCalc%2Ftui%2Fmedconsole.py;h=071b4bf527acf3d7b3a6180ba42b7c61f470964a;hb=a0b5c06463265eb41b0deb37aff955065aece96f;hp=4384b080e47b487d71fdd3d73432343cdf2372bd;hpb=16ea929e026d029a9d69b3aa977bc0ddd9ad0a4c;p=modules%2Fmed.git diff --git a/src/MEDCalc/tui/medconsole.py b/src/MEDCalc/tui/medconsole.py index 4384b080e..071b4bf52 100644 --- a/src/MEDCalc/tui/medconsole.py +++ b/src/MEDCalc/tui/medconsole.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D +# Copyright (C) 2012-2019 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -45,34 +45,34 @@ def saveWorkspace(filename): """ try: dataManager.savePersistentFields(filename) - except SALOME.SALOME_Exception, ex: + except SALOME.SALOME_Exception as ex: medcalc.err(ex.details.text) # # Clean workspace -from medevents import notifyGui_cleanWorkspace +from .medevents import notifyGui_cleanWorkspace def cleanWorkspace(): dvars = pyConsoleGlobals if dvars is None: return all_keys = [] - for varkey, var in dvars.items(): + for varkey, var in list(dvars.items()): if isinstance(var, medcalc.FieldProxy): all_keys.append("%s"%varkey) if len(all_keys) > 0: - exec "del "+",".join(all_keys) in pyConsoleGlobals + exec("del "+",".join(all_keys), pyConsoleGlobals) notifyGui_cleanWorkspace() # # Remove variable from console -from medevents import notifyGui_removeFromWorkspace +from .medevents import notifyGui_removeFromWorkspace def removeFromWorkspace(fieldProxy): dvars = pyConsoleGlobals if dvars is None: return - for varkey, var in dvars.items(): + for varkey, var in list(dvars.items()): if isinstance(var, medcalc.FieldProxy) and var.id == fieldProxy.id: - exec("del %s"%varkey) in pyConsoleGlobals + exec(("del %s"%varkey), pyConsoleGlobals) notifyGui_removeFromWorkspace(fieldProxy.id) # @@ -90,7 +90,7 @@ def getEnvironment(local=True, remote=False): medcalc.inf("Type this command \"import medcalc; medcalc.setConsoleGlobals(globals())") if remote is True: status="========= Fields used in the current context ===\n" - for varkey in dvars.keys(): + for varkey in list(dvars.keys()): var = dvars[varkey] if isinstance(var, medcalc.FieldProxy): status+="%s \t(id=%s, name=%s)\n"%(varkey,var.id,var.fieldname) @@ -116,7 +116,7 @@ def getEnvironment(local=True, remote=False): # # For simpler typing, one can create a python command for status -# (avoid to type "print getEnvironment()") +# (avoid to type "print(getEnvironment())") class ListFields(object): """ A stat object displays the status of the med operating context, i.e. the @@ -140,7 +140,7 @@ la = ListFields(all=True) # # Add variable to workspace -from medevents import notifyGui_putInWorkspace +from .medevents import notifyGui_putInWorkspace def putInWorkspace(fieldProxy): """ This function puts a reference to this field in the GUI data