Tweaking import style

Author: clittle

layers/core/filter.py

@@ -1,5 +1,9 @@
-from layers.core.exceptions import typeCheckerArray, categoryChecker, \
-    UNSETVALUE
+try:
+    from ..core.exceptions import typeCheckerArray, categoryChecker, \
+        UNSETVALUE
+except ValueError:
+    from core.exceptions import typeCheckerArray, categoryChecker, \
+        UNSETVALUE
 
 
 class Filter:

layers/core/gradient.py

@@ -1,4 +1,7 @@
-from layers.core.exceptions import typeChecker, typeCheckerArray
+try:
+    from ..core.exceptions import typeChecker, typeCheckerArray
+except ValueError:
+    from core.exceptions import typeChecker, typeCheckerArray
 
 
 class Gradient:

layers/core/layer.py

@@ -1,7 +1,12 @@
 import json
-from layers.core.exceptions import UninitializedLayer, BadType, BadInput, \
-    handler
-from layers.core.layerobj import _LayerObj
+try:
+    from ..core.exceptions import UninitializedLayer, BadType, BadInput, \
+        handler
+    from ..core.layerobj import _LayerObj
+except ValueError:
+    from core.exceptions import UninitializedLayer, BadType, BadInput, \
+        handler
+    from core.layerobj import _LayerObj
 
 
 class Layer:

layers/core/layerobj.py

@@ -1,12 +1,21 @@
-from layers.core.filter import Filter
-from layers.core.layout import Layout
-from layers.core.technique import Technique
-from layers.core.gradient import Gradient
-from layers.core.legenditem import LegendItem
-from layers.core.metadata import Metadata
-from layers.core.exceptions import UNSETVALUE, typeChecker, BadInput, \
-    handler, categoryChecker, UnknownLayerProperty
-
+try:
+    from ..core.filter import Filter
+    from ..core.layout import Layout
+    from ..core.technique import Technique
+    from ..core.gradient import Gradient
+    from ..core.legenditem import LegendItem
+    from ..core.metadata import Metadata
+    from ..core.exceptions import UNSETVALUE, typeChecker, BadInput, handler, \
+        categoryChecker, UnknownLayerProperty
+except ValueError:
+    from core.filter import Filter
+    from core.layout import Layout
+    from core.technique import Technique
+    from core.gradient import Gradient
+    from core.legenditem import LegendItem
+    from core.metadata import Metadata
+    from core.exceptions import UNSETVALUE, typeChecker, BadInput, handler, \
+        categoryChecker, UnknownLayerProperty
 
 class _LayerObj:
     def __init__(self, version, name, domain):

layers/core/layout.py

@@ -1,4 +1,7 @@
-from layers.core.exceptions import typeChecker, categoryChecker, UNSETVALUE
+try:
+    from ..core.exceptions import typeChecker, categoryChecker, UNSETVALUE
+except ValueError:
+    from core.exceptions import typeChecker, categoryChecker, UNSETVALUE
 
 
 class Layout:

layers/core/legenditem.py

@@ -1,4 +1,7 @@
-from layers.core.exceptions import typeChecker
+try:
+    from ..core.exceptions import typeChecker
+except ValueError:
+    from core.exceptions import typeChecker
 
 
 class LegendItem:

layers/core/metadata.py

@@ -1,4 +1,7 @@
-from layers.core.exceptions import typeChecker
+try:
+    from ..core.exceptions import typeChecker
+except ValueError:
+    from core.exceptions import typeChecker
 
 
 class Metadata:

layers/core/technique.py

@@ -1,6 +1,11 @@
-from layers.core.exceptions import BadInput, handler, typeChecker, \
-    UNSETVALUE, UnknownTechniqueProperty, BadType
-from layers.core.metadata import Metadata
+try:
+    from ..core.exceptions import BadInput, handler, typeChecker, \
+        UNSETVALUE, UnknownTechniqueProperty, BadType
+    from ..core.metadata import Metadata
+except ValueError:
+    from core.exceptions import BadInput, handler, typeChecker, \
+        UNSETVALUE, UnknownTechniqueProperty, BadType
+    from core.metadata import Metadata
 
 
 class Technique:

layers/manipulators/layerops.py

@@ -20,7 +20,10 @@
 # out_layer2.export_file("C:\demo_layer2.json")
 
 import copy
-from layers.core import Layer
+try:
+    from core import Layer
+except ModuleNotFoundError:
+    from ..core import Layer
 
 
 class InvalidFormat(Exception):