[Bf-extensions-cvs] [606fbde] master: Avoid modification of python system paths
Sergey Sharybin
noreply at git.blender.org
Wed Aug 3 13:37:50 CEST 2016
Commit: 606fbde1c3968d2db1b7beb954a778a4997905c9
Author: Sergey Sharybin
Date: Wed Aug 3 13:36:22 2016 +0200
Branches: master
https://developer.blender.org/rBA606fbde1c3968d2db1b7beb954a778a4997905c9
Avoid modification of python system paths
This isn't a proper way to solve the import problem, use relative import instead.
===================================================================
M archimesh/__init__.py
M archimesh/achm_books_maker.py
M archimesh/achm_column_maker.py
M archimesh/achm_curtain_maker.py
M archimesh/achm_door_maker.py
M archimesh/achm_gltools.py
M archimesh/achm_kitchen_maker.py
M archimesh/achm_lamp_maker.py
M archimesh/achm_main_panel.py
M archimesh/achm_roof_maker.py
M archimesh/achm_room_maker.py
M archimesh/achm_shelves_maker.py
M archimesh/achm_stairs_maker.py
M archimesh/achm_venetian_maker.py
M archimesh/achm_window_maker.py
M archimesh/achm_window_panel.py
M measureit/__init__.py
M measureit/measureit_main.py
M measureit/measureit_render.py
===================================================================
diff --git a/archimesh/__init__.py b/archimesh/__init__.py
index 6fab5c1..75784c4 100644
--- a/archimesh/__init__.py
+++ b/archimesh/__init__.py
@@ -40,18 +40,6 @@ import sys
import os
# ----------------------------------------------
-# Add to Phyton path (once only)
-# ----------------------------------------------
-path = sys.path
-flag = False
-for item in path:
- if "archimesh" in item:
- flag = True
-if flag is False:
- sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'archimesh'))
- print("archimesh: added to phytonpath")
-
-# ----------------------------------------------
# Import modules
# ----------------------------------------------
if "bpy" in locals():
@@ -72,20 +60,20 @@ if "bpy" in locals():
imp.reload(achm_window_panel)
print("archimesh: Reloaded multifiles")
else:
- import achm_books_maker
- import achm_column_maker
- import achm_curtain_maker
- import achm_venetian_maker
- import achm_door_maker
- import achm_kitchen_maker
- import achm_lamp_maker
- import achm_main_panel
- import achm_roof_maker
- import achm_room_maker
- import achm_shelves_maker
- import achm_stairs_maker
- import achm_window_maker
- import achm_window_panel
+ from . import achm_books_maker
+ from . import achm_column_maker
+ from . import achm_curtain_maker
+ from . import achm_venetian_maker
+ from . import achm_door_maker
+ from . import achm_kitchen_maker
+ from . import achm_lamp_maker
+ from . import achm_main_panel
+ from . import achm_roof_maker
+ from . import achm_room_maker
+ from . import achm_shelves_maker
+ from . import achm_stairs_maker
+ from . import achm_window_maker
+ from . import achm_window_panel
print("archimesh: Imported multifiles")
diff --git a/archimesh/achm_books_maker.py b/archimesh/achm_books_maker.py
index 1d0f47e..0d9c34e 100644
--- a/archimesh/achm_books_maker.py
+++ b/archimesh/achm_books_maker.py
@@ -29,7 +29,7 @@ import math
import random
import copy
import colorsys
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_column_maker.py b/archimesh/achm_column_maker.py
index d13f544..aff15b7 100644
--- a/archimesh/achm_column_maker.py
+++ b/archimesh/achm_column_maker.py
@@ -26,7 +26,7 @@
# noinspection PyUnresolvedReferences
import bpy
import math
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_curtain_maker.py b/archimesh/achm_curtain_maker.py
index 30e4f45..1e94d6b 100644
--- a/archimesh/achm_curtain_maker.py
+++ b/archimesh/achm_curtain_maker.py
@@ -28,7 +28,7 @@ import bpy
import colorsys
import copy
import math
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_door_maker.py b/archimesh/achm_door_maker.py
index cbc1668..36eba64 100644
--- a/archimesh/achm_door_maker.py
+++ b/archimesh/achm_door_maker.py
@@ -27,7 +27,7 @@ import bpy
import math
# noinspection PyUnresolvedReferences
from bpy.props import *
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_gltools.py b/archimesh/achm_gltools.py
index 57eab97..1cadedb 100644
--- a/archimesh/achm_gltools.py
+++ b/archimesh/achm_gltools.py
@@ -34,7 +34,7 @@ import math
import mathutils
# noinspection PyUnresolvedReferences
from bpy_extras import view3d_utils
-from achm_room_maker import get_wall_points
+from .achm_room_maker import get_wall_points
# -------------------------------------------------------------
diff --git a/archimesh/achm_kitchen_maker.py b/archimesh/achm_kitchen_maker.py
index bad0de5..21a3e56 100644
--- a/archimesh/achm_kitchen_maker.py
+++ b/archimesh/achm_kitchen_maker.py
@@ -29,7 +29,7 @@ import copy
import sys
import datetime
import time
-from achm_tools import *
+from .achm_tools import *
from bpy_extras.io_utils import ExportHelper
# ----------------------------------------------------------
diff --git a/archimesh/achm_lamp_maker.py b/archimesh/achm_lamp_maker.py
index 2b2b885..fe21bea 100644
--- a/archimesh/achm_lamp_maker.py
+++ b/archimesh/achm_lamp_maker.py
@@ -26,7 +26,7 @@
import bpy
import math
import copy
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------
diff --git a/archimesh/achm_main_panel.py b/archimesh/achm_main_panel.py
index b2ebbc3..f665057 100644
--- a/archimesh/achm_main_panel.py
+++ b/archimesh/achm_main_panel.py
@@ -27,8 +27,8 @@
import bpy
# noinspection PyUnresolvedReferences
import bgl
-from achm_tools import *
-from achm_gltools import *
+from .achm_tools import *
+from .achm_gltools import *
# -----------------------------------------------------
diff --git a/archimesh/achm_roof_maker.py b/archimesh/achm_roof_maker.py
index d7840b8..c4330df 100644
--- a/archimesh/achm_roof_maker.py
+++ b/archimesh/achm_roof_maker.py
@@ -26,7 +26,7 @@
# noinspection PyUnresolvedReferences
import bpy
import math
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_room_maker.py b/archimesh/achm_room_maker.py
index f7b0313..fec4d23 100644
--- a/archimesh/achm_room_maker.py
+++ b/archimesh/achm_room_maker.py
@@ -30,7 +30,7 @@ import math
import mathutils
import datetime
import time
-from achm_tools import *
+from .achm_tools import *
# noinspection PyUnresolvedReferences
from bpy_extras.io_utils import ExportHelper, ImportHelper
diff --git a/archimesh/achm_shelves_maker.py b/archimesh/achm_shelves_maker.py
index 178b189..704ae48 100644
--- a/archimesh/achm_shelves_maker.py
+++ b/archimesh/achm_shelves_maker.py
@@ -25,7 +25,7 @@
# ----------------------------------------------------------
import bpy
import copy
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_stairs_maker.py b/archimesh/achm_stairs_maker.py
index 92558dc..78ab57f 100644
--- a/archimesh/achm_stairs_maker.py
+++ b/archimesh/achm_stairs_maker.py
@@ -26,7 +26,7 @@
# noinspection PyUnresolvedReferences
import bpy
import math
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_venetian_maker.py b/archimesh/achm_venetian_maker.py
index 905e49e..4e8ae33 100644
--- a/archimesh/achm_venetian_maker.py
+++ b/archimesh/achm_venetian_maker.py
@@ -27,7 +27,7 @@ import bpy
import math
# noinspection PyUnresolvedReferences
from bpy.props import *
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_window_maker.py b/archimesh/achm_window_maker.py
index a12a1e7..069c31d 100644
--- a/archimesh/achm_window_maker.py
+++ b/archimesh/achm_window_maker.py
@@ -27,7 +27,7 @@ import bpy
import math
# noinspection PyUnresolvedReferences
from bpy.props import *
-from achm_tools import *
+from .achm_tools import *
# ------------------------------------------------------------------
diff --git a/archimesh/achm_window_panel.py b/archimesh/achm_window_panel.py
index c3c6862..4c5e5dd 100644
--- a/archimesh/achm_window_panel.py
+++ b/archimesh/achm_window_panel.py
@@ -31,7 +31,7 @@ import bpy
import math
# noinspection PyUnresolvedReferences
import mathutils
-from achm_tools import *
+from .achm_tools import *
def fitil(vr, fc, px, pz, x, y, z, zz, xx):
diff --git a/measureit/__init__.py b/measureit/__init__.py
index 3401a6a..8e7841f 100644
--- a/measureit/__init__.py
+++ b/measureit/__init__.py
@@ -40,18 +40,6 @@ 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
# ----------------------------------------------
if "bpy" in locals():
@@ -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 798bb5b..6e01f90 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 6c9733d..cac0a5a 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 *
# -------------------------------------------------------------
More information about the Bf-extensions-cvs
mailing list