# HG changeset patch # User GP Orcullo # Date 1666933612 -28800 # Node ID a80a66ba52d6e2dcddcd2d6516d429aa77fcd07a # Parent f62625418bffa234267b42f3c6d39ee4e3baf2b9 fixed plcopen imports diff -r f62625418bff -r a80a66ba52d6 plcopen/BlockInstanceCollector.py --- a/plcopen/BlockInstanceCollector.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/BlockInstanceCollector.py Fri Oct 28 13:06:52 2022 +0800 @@ -5,7 +5,7 @@ from collections import OrderedDict, namedtuple -from plcopen.XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args +from . XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args # ------------------------------------------------------------------------------- # Helpers object for generating pou block instances list diff -r f62625418bff -r a80a66ba52d6 plcopen/InstanceTagnameCollector.py --- a/plcopen/InstanceTagnameCollector.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/InstanceTagnameCollector.py Fri Oct 28 13:06:52 2022 +0800 @@ -4,8 +4,8 @@ # See COPYING file for copyrights details. -from plcopen.XSLTModelQuery import XSLTModelQuery -from plcopen.types_enums import * +from . XSLTModelQuery import XSLTModelQuery +from . types_enums import * class InstanceTagName(object): diff -r f62625418bff -r a80a66ba52d6 plcopen/InstancesPathCollector.py --- a/plcopen/InstancesPathCollector.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/InstancesPathCollector.py Fri Oct 28 13:06:52 2022 +0800 @@ -4,7 +4,7 @@ # See COPYING file for copyrights details. -from plcopen.XSLTModelQuery import XSLTModelQuery +from . XSLTModelQuery import XSLTModelQuery class InstancesPathCollector(XSLTModelQuery): diff -r f62625418bff -r a80a66ba52d6 plcopen/POUVariablesCollector.py --- a/plcopen/POUVariablesCollector.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/POUVariablesCollector.py Fri Oct 28 13:06:52 2022 +0800 @@ -4,8 +4,8 @@ # See COPYING file for copyrights details. -from plcopen.XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args -from plcopen.types_enums import CLASS_TYPES, POU_TYPES, VAR_CLASS_INFOS +from . XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args +from . types_enums import CLASS_TYPES, POU_TYPES, VAR_CLASS_INFOS def class_extraction(value): diff -r f62625418bff -r a80a66ba52d6 plcopen/VariableInfoCollector.py --- a/plcopen/VariableInfoCollector.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/VariableInfoCollector.py Fri Oct 28 13:06:52 2022 +0800 @@ -4,7 +4,7 @@ # See COPYING file for copyrights details. -from plcopen.XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args +from . XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args # ------------------------------------------------------------------------------- # Helpers object for generating pou var list diff -r f62625418bff -r a80a66ba52d6 plcopen/XSLTModelQuery.py --- a/plcopen/XSLTModelQuery.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/XSLTModelQuery.py Fri Oct 28 13:06:52 2022 +0800 @@ -7,7 +7,7 @@ import os from lxml import etree import util.paths as paths -from plcopen.structures import StdBlckLibs +from . structures import StdBlckLibs from XSLTransform import XSLTransform ScriptDirectory = paths.AbsDir(__file__) diff -r f62625418bff -r a80a66ba52d6 plcopen/__init__.py --- a/plcopen/__init__.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/__init__.py Fri Oct 28 13:06:52 2022 +0800 @@ -27,6 +27,6 @@ # plcopen module dynamically creates its classes -from plcopen.plcopen import \ +from . plcopen import \ PLCOpenParser, LoadProject, SaveProject, LoadPou, \ LoadPouInstances, VarOrder, QualifierList, rect diff -r f62625418bff -r a80a66ba52d6 plcopen/structures.py --- a/plcopen/structures.py Fri Oct 28 12:39:15 2022 +0800 +++ b/plcopen/structures.py Fri Oct 28 13:06:52 2022 +0800 @@ -28,8 +28,8 @@ from collections import OrderedDict from functools import reduce -from plcopen.plcopen import LoadProject -from plcopen.definitions import * +from . plcopen import LoadProject +from . definitions import * TypeHierarchy = dict(TypeHierarchy_list)