beremiz

Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.

2020-05-26, Edouard Tisserant
d15a997859b1
Parents 769fefae7c81
Children d692e01d94f4
Solve import order problem when POULibrary imports ConfigTreeNode because of UserAddressedException. Now UserAddressedException is declared in POULibrary.py, as a quick and dirty fix, but some independant module should be created for beremiz exceptions in general.
3 files changed, 11 insertions(+), 4 deletions(-)
  • +0 -3
    ConfigTreeNode.py
  • +9 -0
    POULibrary.py
  • +2 -1
    ProjectController.py
    • --- a/ConfigTreeNode.py Wed Dec 18 13:31:22 2019 +0100
    +++ b/ConfigTreeNode.py Tue May 26 09:58:20 2020 +0200
    @@ -678,6 +678,3 @@
    raise UserAddressedException(message)
    -class UserAddressedException(Exception):
    - pass
    -
    --- a/POULibrary.py Wed Dec 18 13:31:22 2019 +0100
    +++ b/POULibrary.py Tue May 26 09:58:20 2020 +0200
    @@ -26,6 +26,10 @@
    from __future__ import absolute_import
    from weakref import ref
    +# Exception type for problems that user has to take action in order to fix
    +class UserAddressedException(Exception):
    + pass
    +
    class POULibrary(object):
    def __init__(self, CTR, LibName, TypeStack):
    @@ -59,6 +63,11 @@
    # Pure python or IEC libs doesn't produce C code
    return ((""), [], False), ""
    + def FatalError(self, message):
    + """ Raise an exception that will trigger error message intended to
    + the user, but without backtrace since it is not a software error """
    +
    + raise UserAddressedException(message)
    def SimplePOULibraryFactory(path):
    class SimplePOULibrary(POULibrary):
    --- a/ProjectController.py Wed Dec 18 13:31:22 2019 +0100
    +++ b/ProjectController.py Tue May 26 09:58:20 2020 +0200
    @@ -63,7 +63,8 @@
    import targets
    from runtime.typemapping import DebugTypesSize, UnpackDebugBuffer
    from runtime import PlcStatus
    -from ConfigTreeNode import ConfigTreeNode, XSDSchemaErrorMessage, UserAddressedException
    +from ConfigTreeNode import ConfigTreeNode, XSDSchemaErrorMessage
    +from POULibrary import UserAddressedException
    base_folder = paths.AbsParentDir(__file__)