From 606fbde1c3968d2db1b7beb954a778a4997905c9 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Wed, 3 Aug 2016 13:36:22 +0200
Subject: Avoid modification of python system paths

This isn't a proper way to solve the import problem, use relative import instead.
---
 measureit/__init__.py         | 14 +-------------
 measureit/measureit_main.py   |  4 ++--
 measureit/measureit_render.py |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'measureit')

diff --git a/measureit/__init__.py b/measureit/__init__.py
index 3401a6a6..8e7841fb 100644
--- a/measureit/__init__.py
+++ b/measureit/__init__.py
@@ -39,18 +39,6 @@ bl_info = {
 import sys
 import os
 
-# ----------------------------------------------
-# Add to Phyton path (once only)
-# ----------------------------------------------
-path = sys.path
-flag = False
-for item in path:
-    if "measureit" in item:
-        flag = True
-if flag is False:
-    sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'measureit'))
-    print("measureit: added to phytonpath")
-
 # ----------------------------------------------
 # Import modules
 # ----------------------------------------------
@@ -60,7 +48,7 @@ if "bpy" in locals():
     imp.reload(measureit_main)
     print("measureit: Reloaded multifiles")
 else:
-    import measureit_main
+    from . import measureit_main
 
     print("measureit: Imported multifiles")
 
diff --git a/measureit/measureit_main.py b/measureit/measureit_main.py
index 798bb5b7..6e01f903 100644
--- a/measureit/measureit_main.py
+++ b/measureit/measureit_main.py
@@ -33,8 +33,8 @@ import bgl
 # noinspection PyUnresolvedReferences
 from bpy.app.handlers import persistent
 # noinspection PyUnresolvedReferences
-from measureit_geometry import *
-from measureit_render import *
+from .measureit_geometry import *
+from .measureit_render import *
 
 
 # ------------------------------------------------------
diff --git a/measureit/measureit_render.py b/measureit/measureit_render.py
index 6c9733df..cac0a5a2 100644
--- a/measureit/measureit_render.py
+++ b/measureit/measureit_render.py
@@ -42,7 +42,7 @@ import bpy_extras.object_utils as object_utils
 # noinspection PyUnresolvedReferences
 from bpy_extras import view3d_utils
 from math import ceil
-from measureit_geometry import *
+from .measureit_geometry import *
 
 
 # -------------------------------------------------------------
-- 
cgit v1.2.3