X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FConfig.py;h=c1dbe70f8af3403cb7e7be0675b72eb6097b8a14;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=7d666b32e9e16d5760507462051c2e5199543414;hpb=24d16d18acab3da7bccc3e09df4927e9cf2d3246;p=plcapi.git diff --git a/PLC/Config.py b/PLC/Config.py index 7d666b32..c1dbe70f 100644 --- a/PLC/Config.py +++ b/PLC/Config.py @@ -6,8 +6,6 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id$ -# import os import sys @@ -35,11 +33,11 @@ class Config: except: # Try myplc directory try: - execfile(file, self.__dict__) + execfile(myplc + os.sep + "plc_config", self.__dict__) except: raise PLCAPIError("Could not find plc_config in " + \ file + ", " + \ - myplc + "plc_config") + myplc + os.sep + "plc_config") class XMLConfig: """ @@ -64,7 +62,7 @@ class XMLConfig: except: raise PLCAPIError("Could not find plc_config.xml in " + \ file + ", " + \ - myplc + "plc_config.xml") + myplc + os.sep + "plc_config.xml") for (category, variablelist) in cfg.variables().values(): for variable in variablelist.values():