r4313 - in /1.3: prompt/molmol.py relax -- January 04, 2008 - 14:08

Author: bugman
Date: Fri Jan  4 14:08:24 2008
New Revision: 4313

URL: http://svn.gna.org/viewcvs/relax?rev=4313&view=rev
Log:
Removed all of the imports of the now non-existant 'Colour' class.


Modified:
    1.3/prompt/molmol.py
    1.3/relax

Modified: 1.3/prompt/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/molmol.py?rev=4313&r1=4312&r2=4313&view=diff
==============================================================================
--- 1.3/prompt/molmol.py (original)
+++ 1.3/prompt/molmol.py Fri Jan  4 14:08:24 2008
@@ -22,7 +22,7 @@
 
 import sys
 
-from colour import Colour
+import colour
 import help
 from relax_errors import RelaxBinError, RelaxListNumError, 
RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
 from specific_fns.model_free import Molmol
@@ -474,7 +474,7 @@
     write.__doc__ = write.__doc__ + "\n\n" + Molmol.classic.__doc__ + "\n\n"
 
     # Molmol RGB colour list.
-    write.__doc__ = write.__doc__ + "\n\n" + Colour.molmol_colours.__doc__ + 
"\n\n"
+    write.__doc__ = write.__doc__ + "\n\n" + colour.molmol_colours.__doc__ + 
"\n\n"
 
     # X11 RGB colour list.
-    write.__doc__ = write.__doc__ + "\n\n" + Colour.x11_colours.__doc__ + 
"\n\n"
+    write.__doc__ = write.__doc__ + "\n\n" + colour.x11_colours.__doc__ + 
"\n\n"

Modified: 1.3/relax
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=4313&r1=4312&r2=4313&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Fri Jan  4 14:08:24 2008
@@ -65,7 +65,6 @@
     sys.exit()
 
 # relax modules.
-from colour import Colour
 import generic_fns
 from prompt.gpl import gpl
 from prompt import interpreter
@@ -106,9 +105,6 @@
 
         # The thread data storage object.
         self.thread_data = ThreadData()
-
-        # Colour operations.
-        self.colour = Colour()
 
         # Setup the object containing the generic functions.
         self.generic = generic_fns