diff -r 5b6ad7a7fd9d -r 3311eea28d56 canfestival/canfestival.py --- a/canfestival/canfestival.py Mon Aug 21 21:55:18 2017 +0300 +++ b/canfestival/canfestival.py Mon Aug 21 22:41:37 2017 +0300 @@ -26,35 +26,46 @@ import os import sys import shutil +import wx +from gnosis.xml.pickle import * +from gnosis.xml.pickle.util import setParanoia import util.paths as paths - -base_folder = paths.AbsParentDir(__file__, 2) -CanFestivalPath = os.path.join(base_folder, "CanFestival-3") -sys.path.append(os.path.join(CanFestivalPath, "objdictgen")) - -import wx - -from nodelist import NodeList +from util.TranslationCatalogs import AddCatalog +from ConfigTreeNode import ConfigTreeNode +from PLCControler import \ + LOCATION_CONFNODE, \ + LOCATION_MODULE, \ + LOCATION_GROUP, \ + LOCATION_VAR_INPUT, \ + LOCATION_VAR_OUTPUT, \ + LOCATION_VAR_MEMORY + +try: + from nodelist import NodeList +except ImportError: + base_folder = paths.AbsParentDir(__file__, 2) + CanFestivalPath = os.path.join(base_folder, "CanFestival-3") + sys.path.append(os.path.join(CanFestivalPath, "objdictgen")) + + from nodelist import NodeList + + from nodemanager import NodeManager import config_utils import gen_cfile import eds_utils import canfestival_config as local_canfestival_config -from ConfigTreeNode import ConfigTreeNode + from commondialogs import CreateNodeDialog from subindextable import IECTypeConversion, SizeConversion - -from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY from SlaveEditor import SlaveEditor, MasterViewer from NetworkEditor import NetworkEditor -from gnosis.xml.pickle import * -from gnosis.xml.pickle.util import setParanoia + +AddCatalog(os.path.join(CanFestivalPath, "objdictgen", "locale")) setParanoia(0) -from util.TranslationCatalogs import AddCatalog -AddCatalog(os.path.join(CanFestivalPath, "objdictgen", "locale")) # -------------------------------------------------- # Location Tree Helper