Various adjustments. I should commit more often ;).

[calibcant.git] / calibcant / common.py

diff --git a/calibcant/common.py b/calibcant/common.py
index 24e5f1d9449c926c2fbe4ae523c3e4eff553b4ac..1e8ff7137e3c839f6a4ed3496842428099bc59d5 100644 (file)
--- a/calibcant/common.py
+++ b/calibcant/common.py
@@ -23,14 +23,15 @@
 
 import config
 
-VERSION="0.2"
+VERSION="0.3"
 
 # handle extra verbose input modules, only imported if we need them
 _flush_plot = None
 _final_flush_plot = None
 _pylab = None
+def _dummy_fn(): pass
 
-def _import_pylab() :
+def _import_pylab() :  # TODO: auto detect no DISPLAY and abort
     """Import pylab plotting functions for when we need to plot.  This
     function can be called multiple times, and ensures that the pylab
     setup is only imported once.  It defines the functions
@@ -46,12 +47,12 @@ def _import_pylab() :
         if config.PYLAB_INTERACTIVE :
             _flush_plot = _pylab.draw
         else :
-            def _flush_plot () : pass
+            _flush_plot = _pylab.show #_dummy_fn
     if _final_flush_plot == None :
         if config.PYLAB_INTERACTIVE :
             _final_flush_plot = _pylab.draw
         else :
-            _final_flush_plot = _pylab.show
+            _final_flush_plot = _dummy_fn # _pylab.show
 
 def write_array(ofile, array, seperator):
     """Erite an iterable array seperated by seperator.