Update imports

Changed imports to be a try/except for running directly and via installed.
MiM-MiM · Mar 28, 2022 · c26be1b · c26be1b
1 parent 11d792c
commit c26be1b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# User added
+.gitignore
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/src/HDR10PlusEditor/HDR10Plus/HDR10Plus.py b/src/HDR10PlusEditor/HDR10Plus/HDR10Plus.py
@@ -11,7 +11,10 @@ def export_as_json(self, saveName):
             raise RuntimeError(
                 f"{__name__ }.export_as_json() expected a string filepath."
             )
-        import HDR10Plus.json as HDR10PlusJSON
+        try:
+            import HDR10PlusEditor.HDR10Plus.json as HDR10PlusJSON
+        except:
+            import HDR10Plus.json as HDR10PlusJSON
 
         HDR10PlusJSON.export(dct=self.HDR10Plus_DCT, saveName=saveName)
 

diff --git a/src/HDR10PlusEditor/__main__.py b/src/HDR10PlusEditor/__main__.py
@@ -1,6 +1,10 @@
 # /bin/python3
-import HDR10PlusEditor.HDR10Plus.json as HDR10PlusJSON
-import HDR10PlusEditor.HDR10Plus.HDR10Plus as HDR10Plus
+try:
+    import HDR10PlusEditor.HDR10Plus.json as HDR10PlusJSON
+    import HDR10PlusEditor.HDR10Plus.HDR10Plus as HDR10Plus
+except:
+    import HDR10Plus.json as HDR10PlusJSON
+    import HDR10Plus.HDR10Plus as HDR10Plus
 
 def main():
     import argparse