Some cleanup and preperation for better packaging.

diff --git a/Cura/__init__.py b/Cura/__init__.py
index 6e968ba14129cbd10b96c7ca4fbe03d8d79dd035..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/__init__.py
+++ b/Cura/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 0
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/avr_isp/__init__.py b/Cura/avr_isp/__init__.py
index 163803379e672a3c9fe203ecc23ca94b415260c9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/avr_isp/__init__.py
+++ b/Cura/avr_isp/__init__.py
@@ -1,13 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-
-numberOfLevelsDeepInPackageHierarchy = 1
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/__init__.py b/Cura/cura_sf/__init__.py
index bdac25da5707928fc19fc1886f31edc3f198ccd3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/__init__.py
+++ b/Cura/cura_sf/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 1
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/__init__.py b/Cura/cura_sf/fabmetheus_utilities/__init__.py
index 163803379e672a3c9fe203ecc23ca94b415260c9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/__init__.py
@@ -1,13 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-
-numberOfLevelsDeepInPackageHierarchy = 1
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py
index 2dc8ddc962b40a0b82f96d1913cb4572595c56fc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 2
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py
index cefa3e7c70be45842af5bf7757b495bd01501395..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py
@@ -1,12 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py
index 3345e9647335b4550763f6ddcae4a620e6a017da..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py
@@ -1,12 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 2
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py
index cefa3e7c70be45842af5bf7757b495bd01501395..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py
@@ -1,12 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py
index 58ec332e37c270781e2ff13d18c510539833d5d4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 4
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py
index cefa3e7c70be45842af5bf7757b495bd01501395..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py
@@ -1,12 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py
index 58ec332e37c270781e2ff13d18c510539833d5d4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 4
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py
index 58ec332e37c270781e2ff13d18c510539833d5d4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 4
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py
index 58ec332e37c270781e2ff13d18c510539833d5d4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 4
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py
index cefa3e7c70be45842af5bf7757b495bd01501395..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py
@@ -1,12 +0,0 @@
-"""
-This page is in the table of contents.
-This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-"""
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py
index 2dc8ddc962b40a0b82f96d1913cb4572595c56fc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 2
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py
+++ b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/__init__.py b/Cura/cura_sf/skeinforge_application/__init__.py
index bdac25da5707928fc19fc1886f31edc3f198ccd3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 1
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py
index 2dc8ddc962b40a0b82f96d1913cb4572595c56fc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 2
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py
index 58ec332e37c270781e2ff13d18c510539833d5d4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 4
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py
index b83e94183dbfa9769c4b17838fc3fd0b5911f9cb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 5
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py
index 1121e8ab50ec9ebe93dffdcdee528f6d2869da9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 3
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py
index 2dc8ddc962b40a0b82f96d1913cb4572595c56fc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py
@@ -1,9 +0,0 @@
-#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
-import os
-import sys
-numberOfLevelsDeepInPackageHierarchy = 2
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/gui/__init__.py b/Cura/gui/__init__.py
index 4870325b1f21917eda2d8e53954b3d9ed88c59e1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/gui/__init__.py
+++ b/Cura/gui/__init__.py
@@ -1,9 +0,0 @@
-import os
-import sys
-
-numberOfLevelsDeepInPackageHierarchy = 1
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/util/__init__.py b/Cura/util/__init__.py
index 4870325b1f21917eda2d8e53954b3d9ed88c59e1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Cura/util/__init__.py
+++ b/Cura/util/__init__.py
@@ -1,9 +0,0 @@
-import os
-import sys
-
-numberOfLevelsDeepInPackageHierarchy = 1
-packageFilePath = os.path.abspath(__file__)
-for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
-       packageFilePath = os.path.dirname( packageFilePath )
-if packageFilePath not in sys.path:
-       sys.path.insert( 0, packageFilePath )

diff --git a/Cura/util/exporer.py b/Cura/util/exporer.py
index 5eca1416bbcefff292b36eab033c2e3108ad560d..c729243a3969bbc4c55a5d1ce437e4130026c6b3 100644 (file)
--- a/Cura/util/exporer.py
+++ b/Cura/util/exporer.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-import __init__
-
 import sys, os, subprocess
 
 def hasExporer():

diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py
index 78e71acb7fc13bf44dd862ff22161a78cca88f0a..9abcacc1e914126a78a9f76d04a56115ea32d7df 100644 (file)
--- a/Cura/util/gcodeInterpreter.py
+++ b/Cura/util/gcodeInterpreter.py
@@ -1,13 +1,10 @@
-from __future__ import absolute_import
-import __init__
-
 import sys
 import math
 import re
 import os
 
-from util import util3d
-from util import profile
+import util3d
+import profile
 
 class gcodePath(object):
        def __init__(self, newType, pathType, layerThickness, startPoint):

diff --git a/Cura/util/mesh.py b/Cura/util/mesh.py
index 1dbd8cd7ea98a76bd229d56e26ff3d38dce5698e..c21984868641a113330cdb4a867a51010592fc98 100644 (file)
--- a/Cura/util/mesh.py
+++ b/Cura/util/mesh.py
@@ -1,9 +1,6 @@
-from __future__ import absolute_import
-import __init__
-
 import sys, math, re, os, struct, time
 
-from util import util3d
+import util3d
 
 class meshFace(object):
        def __init__(self, v0, v1, v2):

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 235f1c388ecc9541073dfa98415382c22ae795f4..23e2888a0f005c02e227136cb04a671ef7cdea71 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -272,7 +272,10 @@ global globalPreferenceParser
 globalPreferenceParser = None\r
 \r
 def getPreferencePath():\r
-       return os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../preferences.ini"))\r
+       basePath = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))\r
+       if os.path.basename(basePath) == 'library.zip':\r
+               basePath = os.path.normpath(os.path.join(basePath, ".."))\r
+       return os.path.normpath(os.path.join(basePath, "preferences.ini"))\r
 \r
 def getPreferenceFloat(name):\r
        try:\r

diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index 47f585d08fdac46552f4b5685ece2a28512e57c1..bc3b98f78e7ab6ca77962b9358b520d6f3d555f5 100644 (file)
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -2,7 +2,11 @@ from __future__ import absolute_import
 
 import platform, os, subprocess, sys
 
-from cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
+cura_sf_path = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../cura_sf/"))
+if cura_sf_path not in sys.path:
+       sys.path.append(cura_sf_path)
+from skeinforge_application.skeinforge_utilities import skeinforge_craft
+
 from util import profile
 
 #How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
@@ -32,10 +36,10 @@ def getPyPyExe():
        "Return the path to the pypy executable if we can find it. Else return False"
        if platform.system() == "Windows":
                exeName = "pypy.exe"
-               pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy/pypy.exe"));
+               pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy/pypy.exe"))
        else:
                exeName = "pypy"
-               pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy/bin/pypy"));
+               pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy/bin/pypy"))
        if os.path.exists(pypyExe):
                return pypyExe
 

diff --git a/Cura/util/stl.py b/Cura/util/stl.py
index 7e3e6421e368ce82c13da93e1cd767c964a3624d..8b87a417d2bd01ae733775db7898535407163421 100644 (file)
--- a/Cura/util/stl.py
+++ b/Cura/util/stl.py
@@ -1,10 +1,7 @@
-from __future__ import absolute_import
-import __init__
-
 import sys, math, re, os, struct, time
 
-from util import util3d
-from util import mesh
+import util3d
+import mesh
 
 class stlModel(mesh.mesh):
        def __init__(self):

diff --git a/Cura/util/util3d.py b/Cura/util/util3d.py
index b5140b275d3a1c63664d030606ef7cd1c6d7a9d3..43146a7e638282294a719c40fe205e3393df2861 100644 (file)
--- a/Cura/util/util3d.py
+++ b/Cura/util/util3d.py
@@ -1,4 +1,3 @@
-
 import math
 
 class Vector3(object):

diff --git a/Cura/util/version.py b/Cura/util/version.py
index 98c9ea5f8dbe69a346c6e76e0096c8c9207276f0..2c27a551366fe58e7e5e095bcdd9f7769502b881 100644 (file)
--- a/Cura/util/version.py
+++ b/Cura/util/version.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-import __init__
-
 import os
 
 def getVersion():