From: W. Trevor King <wking@drexel.edu>
Date: Tue, 1 Jun 2010 13:43:19 +0000 (-0400)
Subject: Fix relative import syntax.
X-Git-Tag: 0.5~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94230553b2f275c060e81fbfce315bd75a226dea;p=calibcant.git

Fix relative import syntax.

Fixes broken implementation from
  81f9df69442d686bed368ac6db2180cd482f1acb
---

diff --git a/calibcant/T_analyze.py b/calibcant/T_analyze.py
index ce4e41a..32751fc 100755
--- a/calibcant/T_analyze.py
+++ b/calibcant/T_analyze.py
@@ -35,8 +35,8 @@ import data_logger
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
-import .common
-import .config
+from . import common
+from . import config
 
 
 def C_to_K(celsius) :
diff --git a/calibcant/__init__.py b/calibcant/__init__.py
index 035d77c..516334b 100644
--- a/calibcant/__init__.py
+++ b/calibcant/__init__.py
@@ -18,4 +18,4 @@
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-from .common import VERSION
+VERSION="0.4"
diff --git a/calibcant/analyze.py b/calibcant/analyze.py
index 81f88c2..b8e4c71 100755
--- a/calibcant/analyze.py
+++ b/calibcant/analyze.py
@@ -49,9 +49,9 @@ import data_logger
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
-import .common
-import .config
-import .T_analyze
+from . import common
+from . import config
+from . import T_analyze
 
 
 kb = 1.3806504e-23 # Boltzmann's constant in J/K
diff --git a/calibcant/bump_analyze.py b/calibcant/bump_analyze.py
index 4212da3..88a9648 100755
--- a/calibcant/bump_analyze.py
+++ b/calibcant/bump_analyze.py
@@ -49,8 +49,8 @@ import data_logger
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
-import .common
-import .config
+from . import common
+from . import config
 
 
 @splittableKwargsFunction()
diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py
index 004e22d..c2fb1b8 100755
--- a/calibcant/calibrate.py
+++ b/calibcant/calibrate.py
@@ -107,12 +107,12 @@ import piezo.z_piezo_utils as z_piezo_utils
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
-import .common
-import .config
-import .bump_analyze
-import .T_analyze
-import .vib_analyze
-import .analyze
+from . import common
+from . import config
+from . import bump_analyze
+from . import T_analyze
+from . import vib_analyze
+from . import analyze
 
 
 # bump family
diff --git a/calibcant/common.py b/calibcant/common.py
index 1747901..3f09e9d 100644
--- a/calibcant/common.py
+++ b/calibcant/common.py
@@ -18,11 +18,10 @@
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-import .config
+from . import VERSION
+from . import config
 
 
-VERSION="0.4"
-
 # handle extra verbose input modules, only imported if we need them
 _flush_plot = None
 _final_flush_plot = None
diff --git a/calibcant/vib_analyze.py b/calibcant/vib_analyze.py
index c15d327..2d5e601 100755
--- a/calibcant/vib_analyze.py
+++ b/calibcant/vib_analyze.py
@@ -38,8 +38,8 @@ import FFT_tools
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
-import .common
-import .config
+from . import common
+from . import config
 
 
 PLOT_GUESSED_LORENTZIAN=False