Adjust imports to be all relative

__init__.py

@@ -25,39 +25,39 @@
 import pathlib
 import traceback
 
-from dmx.pymvr import GeneralSceneDescription
-from dmx.mvr import extract_mvr_textures, process_mvr_child_list
-
-from dmx.fixture import *
-from dmx.group import *
-from dmx.universe import *
-from dmx.data import *
-from dmx.gdtf import *
-from dmx.artnet import *
-from dmx.acn import DMX_sACN
-from dmx.network import *
-from dmx.logging import *
-from dmx.panels.recorder import *
-
-from dmx.panels.setup import *
-from dmx.panels.dmx import *
-from dmx.panels.fixtures import *
-from dmx.panels.groups import *
-from dmx.panels.programmer import *
-import dmx.panels.profiles as Profiles
-
-from dmx.preferences import DMX_Preferences, DMX_Regenrate_UUID
-from dmx.group import FixtureGroup
-from dmx.osc_utils import DMX_OSC_Templates
-from dmx.osc import DMX_OSC
-from dmx.mdns import DMX_Zeroconf
-
-from dmx.util import rgb_to_cmy, xyY2rgbaa, ShowMessageBox, cmy_to_rgb, flatten_color
-from dmx.mvr_objects import DMX_MVR_Object
-from dmx.mvr_xchange import *
-from dmx.mvrx_protocol import DMX_MVR_X_Client, DMX_MVR_X_Server
+from .pymvr import GeneralSceneDescription
+from .mvr import extract_mvr_textures, process_mvr_child_list
+
+from .fixture import *
+from .group import *
+from .universe import *
+from .data import *
+from .gdtf import *
+from .artnet import *
+from .acn import DMX_sACN
+from .network import *
+from .logging import *
+from .panels.recorder import *
+
+from .panels.setup import *
+from .panels.dmx import *
+from .panels.fixtures import *
+from .panels.groups import *
+from .panels.programmer import *
+from .panels import profiles as Profiles
+
+from .preferences import DMX_Preferences, DMX_Regenrate_UUID
+from .group import FixtureGroup
+from .osc_utils import DMX_OSC_Templates
+from .osc import DMX_OSC
+from .mdns import DMX_Zeroconf
+
+from .util import rgb_to_cmy, xyY2rgbaa, ShowMessageBox, cmy_to_rgb, flatten_color
+from .mvr_objects import DMX_MVR_Object
+from .mvr_xchange import *
+from .mvrx_protocol import DMX_MVR_X_Client, DMX_MVR_X_Server
 import bpy.utils.previews
-from dmx.material import set_light_nodes, getVolumeScatterMaterial
+from .material import set_light_nodes, getVolumeScatterMaterial
 from bpy.props import (BoolProperty,
                        StringProperty,
                        IntProperty,
@@ -72,7 +72,7 @@
                        Collection,
                        NodeTree)
 
-from dmx.i18n import DMX_Lang
+from .i18n import DMX_Lang
 _ = DMX_Lang._
 
 class DMX_TempData(PropertyGroup):
@@ -610,8 +610,7 @@ def check_blender_version(self):
         DMX_Log.log.info(f"Blender version: {bpy.app.version} ✅")
 
     def ensure_application_uuid(self):
-        addon_name = pathlib.Path(__file__).parent.parts[-1]
-        prefs = bpy.context.preferences.addons[addon_name].preferences
+        prefs = bpy.context.preferences.addons[__package__].preferences
         application_uuid = prefs.get("application_uuid", 0)
         if application_uuid == 0:
             prefs["application_uuid"] = str(py_uuid.uuid4()) # must never be 0
@@ -1580,8 +1579,7 @@ def ensureUniverseExists(self, universe):
 
     def createMVR_Client(self, station_name = "", station_uuid = "", service_name = "", ip_address = "", port = 0, provider = ""):
 
-        addon_name = pathlib.Path(__file__).parent.parts[-1]
-        prefs = bpy.context.preferences.addons[addon_name].preferences
+        prefs = bpy.context.preferences.addons[__package__].preferences
         application_uuid = prefs.get("application_uuid", str(py_uuid.uuid4()))  # must never be 0
         if application_uuid == station_uuid:
             DMX_Log.log.info("This is myself, do not register as an MVR-xchange provider")

acn.py

@@ -1,7 +1,7 @@
 import bpy
-from dmx.sacn import sACNreceiver
-from dmx.data import DMX_Data
-from dmx.logging import DMX_Log
+from .sacn import sACNreceiver
+from .data import DMX_Data
+from .logging import DMX_Log
 import os
 
 

artnet.py

@@ -4,9 +4,9 @@
 import struct
 import threading
 
-from dmx.data import DMX_Data
-from dmx.network import DMX_Network
-from dmx.logging import DMX_Log
+from .data import DMX_Data
+from .network import DMX_Network
+from .logging import DMX_Log
 
 # ArtnetPacket class taken from here:
 # https://gist.github.com/alarrosa14/07bd1ee88a19204cbf22

blender_utils.py

@@ -7,7 +7,7 @@
 import sys
 import importlib
 
-from dmx.i18n import DMX_Lang
+from .i18n import DMX_Lang
 
 _ = DMX_Lang._
 
@@ -115,7 +115,7 @@ def clear_custom_data():
 
 def reload_addon():
     try:
-        module = sys.modules.get("dmx")
+        module = sys.modules.get(__package__)
         if not module:
             raise Exception("DMX module could not be loaded")
         module.unregister()

data.py

@@ -11,7 +11,7 @@
 import bpy
 import time
 
-from dmx.logging import DMX_Log
+from .logging import DMX_Log
 from bpy.types import (PropertyGroup)
 from bpy.props import (IntProperty)
 

fixture.py

@@ -13,17 +13,17 @@
 import random
 import os
 
-from dmx.material import getEmitterMaterial, get_gobo_material, set_light_nodes, get_ies_node, getGeometryNodes
-from dmx.model import DMX_Model
-from dmx.logging import DMX_Log
+from .material import getEmitterMaterial, get_gobo_material, set_light_nodes, get_ies_node, getGeometryNodes
+from .model import DMX_Model
+from .logging import DMX_Log
 
-from dmx.param import DMX_Param, DMX_Model_Param
-from dmx import pygdtf
+from .param import DMX_Param, DMX_Model_Param
+from . import pygdtf
 
-from dmx.gdtf import DMX_GDTF
-from dmx.data import DMX_Data
-from dmx.util import cmy_to_rgb, add_rgb
-from dmx.osc_utils import DMX_OSC_Handlers
+from .gdtf import DMX_GDTF
+from .data import DMX_Data
+from .util import cmy_to_rgb, add_rgb
+from .osc_utils import DMX_OSC_Handlers
 from bpy.props import (IntProperty,
                        FloatProperty,
                        BoolProperty,

gdtf.py

@@ -14,10 +14,10 @@
 import pathlib
 from mathutils import Euler, Matrix
 
-from dmx import pygdtf
-from dmx.logging import DMX_Log
-from dmx.io_scene_3ds.import_3ds import load
-from dmx.util import sanitize_obj_name, xyY2rgbaa
+from . import pygdtf
+from .logging import DMX_Log
+from .io_scene_3ds.import_3ds import load
+from .util import sanitize_obj_name, xyY2rgbaa
 
 class DMX_GDTF():
 

group.py

@@ -17,7 +17,7 @@
                        Property,
                        PropertyGroup)
 
-from dmx.fixture import *
+from .fixture import *
 
 class FixtureGroup():
     def __init__(self, name, uuid):

ifaddr/__init__.py

@@ -21,12 +21,12 @@
 
 import os
 
-from dmx.ifaddr._shared import Adapter, IP
+from ..ifaddr._shared import Adapter, IP
 
 if os.name == "nt":
-    from dmx.ifaddr._win32 import get_adapters
+    from ..ifaddr._win32 import get_adapters
 elif os.name == "posix":
-    from dmx.ifaddr._posix import get_adapters
+    from ..ifaddr._posix import get_adapters
 else:
     raise RuntimeError("Unsupported Operating System: %s" % os.name)
 

ifaddr/_posix.py

@@ -27,7 +27,7 @@
 
 from typing import Iterable, Optional
 
-import dmx.ifaddr._shared as shared
+from .. ifaddr import _shared as shared
 
 # from ifaddr._shared import sockaddr, Interface, sockaddr_to_ip, ipv6_prefixlength
 

ifaddr/_win32.py

@@ -23,7 +23,7 @@
 from ctypes import wintypes
 from typing import Iterable, List
 
-import dmx.ifaddr._shared as shared
+import ..ifaddr._shared as shared
 
 NO_ERROR = 0
 ERROR_BUFFER_OVERFLOW = 111

material.py

@@ -6,7 +6,7 @@
 #
 
 import bpy
-from dmx.logging import DMX_Log
+from .logging import DMX_Log
 import logging
 
 # Shader Nodes default labels

mdns.py

@@ -1,7 +1,7 @@
 import bpy
-from dmx.zeroconf import IPVersion, ServiceBrowser, ServiceStateChange, Zeroconf, ServiceInfo, get_all_addresses
+from .zeroconf import IPVersion, ServiceBrowser, ServiceStateChange, Zeroconf, ServiceInfo, get_all_addresses
 
-from dmx.logging import DMX_Log
+from .logging import DMX_Log
 from typing import cast
 import uuid as pyuuid
 import socket
@@ -21,8 +21,7 @@ def __init__(self):
         self.browser = None
         self.info = None
         self._dmx = bpy.context.scene.dmx
-        addon_name = pathlib.Path(__file__).parent.parts[-1]
-        prefs = bpy.context.preferences.addons[addon_name].preferences
+        prefs = bpy.context.preferences.addons[__package__].preferences
         application_uuid = prefs.get("application_uuid", str(pyuuid.uuid4()))  # must never be 0
         self.application_uuid = application_uuid
 

model.py

@@ -7,8 +7,8 @@
 
 import bpy
 
-from dmx.gdtf import DMX_GDTF
-from dmx.logging import DMX_Log
+from .gdtf import DMX_GDTF
+from .logging import DMX_Log
 
 
 class DMX_Model:

mvr.py

@@ -1,14 +1,14 @@
 import os
 import bpy
-from dmx.util import xyY2rgbaa
-from dmx.io_scene_3ds.import_3ds import load
+from .util import xyY2rgbaa
+from .io_scene_3ds.import_3ds import load
 from mathutils import Matrix
 import time
 import hashlib
 import json
-from dmx.group import FixtureGroup
-from dmx.mvr_objects import DMX_MVR_Object
-from dmx.logging import DMX_Log
+from .group import FixtureGroup
+from .mvr_objects import DMX_MVR_Object
+from .logging import DMX_Log
 
 
 # importing from dmx didn't work, had to duplicate this function

mvrx_protocol.py

@@ -1,11 +1,11 @@
 import bpy
-from dmx.mvrxchange import mvrxchange_client as mvrx_client
-from dmx.mvrxchange import mvrxchange_server as mvrx_server
-from dmx.logging import DMX_Log
+from .mvrxchange import mvrxchange_client as mvrx_client
+from .mvrxchange import mvrxchange_server as mvrx_server
+from .logging import DMX_Log
 import os
 import time
 import pathlib
-from dmx import bl_info as application_info
+#from dmx import bl_info as application_info
 import uuid as py_uuid
 
 # Instances and callbacks for the MVR TCP client and servers
@@ -22,8 +22,7 @@ def __init__(self):
         self.client = None
         self.selected_client = None
 
-        addon_name = pathlib.Path(__file__).parent.parts[-1]
-        prefs = bpy.context.preferences.addons[addon_name].preferences
+        prefs = bpy.context.preferences.addons[__package__].preferences
         application_uuid = prefs.get("application_uuid", str(py_uuid.uuid4()))  # must never be 0
         self.application_uuid = application_uuid
         # print("bl info", application_info) # TODO: use this in the future
@@ -150,8 +149,7 @@ def __init__(self):
         self._dmx = bpy.context.scene.dmx
         self.server = None
 
-        addon_name = pathlib.Path(__file__).parent.parts[-1]
-        prefs = bpy.context.preferences.addons[addon_name].preferences
+        prefs = bpy.context.preferences.addons[__package__].preferences
         application_uuid = prefs.get("application_uuid", str(py_uuid.uuid4()))  # must never be 0
         self.application_uuid = application_uuid
         # print("bl info", application_info) # TODO: use this in the future

mvrxchange/mvrxchange_client/__init__.py

@@ -8,8 +8,8 @@
 import time
 import selectors
 from datetime import datetime
-from dmx.mvrxchange.mvr_message import mvr_message
-from dmx.logging import DMX_Log
+from ...mvrxchange.mvr_message import mvr_message
+from ...logging import DMX_Log
 
 # A very rudimentary MVR-xchange client
 # For some reason, some apps close the socket, so we must ensure to reconnect

mvrxchange/mvrxchange_server/__init__.py

@@ -8,8 +8,8 @@
 from uuid import uuid4
 import time
 from datetime import datetime
-from dmx.mvrxchange.mvr_message import mvr_message
-from dmx.logging import DMX_Log
+from ...mvrxchange.mvr_message import mvr_message
+from ...logging import DMX_Log
 
 
 class server(Thread):

network.py

@@ -1,5 +1,5 @@
 import bpy
-import dmx.ifaddr as ifaddr
+from . import ifaddr
 
 
 class DMX_Network:

osc.py

@@ -1,6 +1,6 @@
 import bpy
-from dmx.oscpy.server import OSCThreadServer
-from dmx.logging import DMX_Log
+from .oscpy.server import OSCThreadServer
+from .logging import DMX_Log
 
 
 class DMX_OSC:

osc_utils.py

@@ -2,8 +2,8 @@
 import json
 import os
 
-from dmx.osc import DMX_OSC
-from dmx.logging import DMX_Log
+from .osc import DMX_OSC
+from .logging import DMX_Log
 
 
 class DMX_OSC_Templates:

oscpy/client.py

@@ -11,8 +11,8 @@
 from time import sleep
 from sys import platform
 
-from dmx.oscpy.parser import format_message, format_bundle
-from dmx.oscpy.stats import Stats
+from ..oscpy.parser import format_message, format_bundle
+from ..oscpy.stats import Stats
 
 SOCK = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)