Updated import statements, and removed the workflows pca_workflow and

affy_workflow.

fluents/fluents.py

@@ -13,12 +13,12 @@ import gnome
 import gnome.ui
 import scipy
 import pango
-from system import project, workflow, dataset, logger, plots, navigator, dialogs, selections
+import project, workflow, dataset, logger, plots, navigator, dialogs, selections
 
 
 PROGRAM_NAME = 'fluents'
 VERSION = '0.1.0'
-DATADIR = os.path.dirname(sys.modules['system'].__file__)
+DATADIR = os.path.dirname(sys.modules['fluents'].__file__)
 ICONDIR = os.path.join(DATADIR,"..","icons")
 GLADEFILENAME = os.path.join(DATADIR, 'fluents.glade')
 

fluents/navigator.py

@@ -3,7 +3,7 @@ import gtk
 import gobject
 import plots
 import time
-from system import dataset, logger, plots, project, workflow
+import dataset, logger, plots, project, workflow
 
 class NavigatorView (gtk.TreeView):
     def __init__(self, project, app):

fluents/plots.py

@@ -4,7 +4,7 @@ import pygtk
 import gobject
 import gtk
 import fluents
-from system import logger
+import logger
 import matplotlib
 from matplotlib.backends.backend_gtkagg import FigureCanvasGTKAgg as FigureCanvas
 from matplotlib.backend_bases import NavigationToolbar2,cursors

fluents/project.py

@@ -4,7 +4,7 @@ import gobject
 import gtk
 import fluents
 import logger
-from system import dataset, plots
+import dataset, plots
 
 class Project:
     def __init__(self,name="Testing"):

fluents/selections.py

@@ -1,5 +1,5 @@
 
-from system import logger, dataset
+import logger, dataset
 
 import pygtk
 import gtk

fluents/workflow.py

@@ -2,7 +2,7 @@ import gtk
 import sys
 import os
 import inspect
-from system import logger
+import logger
 
 def _workflow_classes(modname):
     """Returns a list of all subclasses of Workflow in a given module"""