Resolve circular dependency on ClrError

Author: filmor

clr_loader/ffi/__init__.py

@@ -50,7 +50,7 @@ def load_netfx():
         arch = "amd64"
     else:
         arch = "x86"
-    
+
     path = os.path.join(dirname, arch, "ClrLoader.dll")
 
     return ffi.dlopen(path)

clr_loader/util/__init__.py

@@ -1,20 +1,6 @@
-class ClrError(Exception):
-    def __init__(self, hresult, name=None, message=None, comment=None):
-        self.hresult = hresult
-        self.name = name
-        self.message = message
-        self.comment = comment
-
-    def __str__(self):
-        if self.message:
-            return f"{hex(self.hresult)}: {self.name} => {self.message}"
-        elif self.name:
-            return f"{hex(self.hresult)}: {self.name}"
-        else:
-            return f"{hex(self.hresult)}"
-
-    def __repr__(self):
-        return f"<ClrError {str(self)}>"
+from .clr_error import ClrError
+from .coreclr_errors import get_coreclr_error
+from .hostfxr_errors import get_hostfxr_error
 
 
 def check_result(err_code):
@@ -29,7 +15,3 @@ def check_result(err_code):
             error = ClrError(hresult)
 
         raise error
-
-
-from .coreclr_errors import get_coreclr_error
-from .hostfxr_errors import get_hostfxr_error

clr_loader/util/clr_error.py

@@ -0,0 +1,17 @@
+class ClrError(Exception):
+    def __init__(self, hresult, name=None, message=None, comment=None):
+        self.hresult = hresult
+        self.name = name
+        self.message = message
+        self.comment = comment
+
+    def __str__(self):
+        if self.message:
+            return f"{hex(self.hresult)}: {self.name} => {self.message}"
+        elif self.name:
+            return f"{hex(self.hresult)}: {self.name}"
+        else:
+            return f"{hex(self.hresult)}"
+
+    def __repr__(self):
+        return f"<ClrError {str(self)}>"

clr_loader/util/coreclr_errors.py

@@ -1,4 +1,4 @@
-from . import ClrError
+from .clr_error import ClrError
 
 
 def get_coreclr_error(hresult):

clr_loader/util/hostfxr_errors.py

@@ -1,4 +1,4 @@
-from . import ClrError
+from .clr_error import ClrError
 
 __all__ = ["get_hostfxr_error"]