Fix aedt_version settings which was causing issues in Ironpython in 22R2 (#1001)

Co-authored-by: maxcapodi78 <Shark78>

Author: maxcapodi78

_unittest/conftest.py

@@ -31,7 +31,10 @@
 
 log_path = os.path.join(tempfile.gettempdir(), "test.log")
 if os.path.exists(os.path.join(tempfile.gettempdir(), "test.log")):
-    os.remove(log_path)
+    try:
+        os.remove(log_path)
+    except:
+        pass
 settings.logger_file_path = log_path
 settings.enable_error_handler = False
 settings.enable_desktop_logs = False

_unittest_ironpython/run_unittests.py

@@ -8,7 +8,10 @@
 
 log_path = os.path.join(tempfile.gettempdir(), "test.log")
 if os.path.exists(os.path.join(tempfile.gettempdir(), "test.log")):
-    os.remove(log_path)
+    try:
+        os.remove(log_path)
+    except:
+        pass
 settings.logger_file_path = log_path
 
 from pyaedt.generic.general_methods import is_ironpython

pyaedt/desktop.py

@@ -294,7 +294,6 @@ def __init__(
         if "oDesktop" in dir():  # pragma: no cover
             self.release_on_exit = False
             self._main.oDesktop = oDesktop
-            settings.aedt_version = oDesktop.GetVersion()[0:6]
             try:
                 settings.non_graphical = oDesktop.GetIsNonGraphical()
             except:
@@ -310,7 +309,6 @@ def __init__(
             if "oDesktop" in dir(self._main):
                 del self._main.oDesktop
             self._main.student_version, version_key, version = self._set_version(specified_version, student_version)
-            settings.aedt_version = version_key
             if _com == "ironpython":  # pragma: no cover
                 print("Launching PyAEDT outside AEDT with IronPython.")
                 self._init_ironpython(non_graphical, new_desktop_session, version)
@@ -326,6 +324,8 @@ def __init__(
         self._logger.info("pyaedt v%s", self._main.pyaedt_version)
         self._logger.info("Python version %s", sys.version)
         self.odesktop = self._main.oDesktop
+        settings.aedt_version = self.odesktop.GetVersion()[0:6]
+
         if _com == "ironpython":
             sys.path.append(
                 os.path.join(self._main.sDesktopinstallDirectory, "common", "commonfiles", "IronPython", "DLLs")

pyaedt/modules/Boundary.py

@@ -32,7 +32,7 @@ def __init__(self, boundary, props):
         OrderedDict.__init__(self)
         if props:
             for key, value in props.items():
-                if isinstance(value, (OrderedDict, OrderedDict)):
+                if isinstance(value, (OrderedDict, dict)):
                     OrderedDict.__setitem__(self, key, BoundaryProps(boundary, value))
                 else:
                     OrderedDict.__setitem__(self, key, value)