Author: bugman Date: Tue Mar 16 14:20:25 2010 New Revision: 11011 URL: http://svn.gna.org/viewcvs/relax?rev=11011&view=rev Log: Reverted r11004 as this, for some unknown reason, undid the changes of r11001. The command used was: svn merge -r11004:11003 . Modified: 1.3/generic_fns/__init__.py 1.3/prompt/__init__.py 1.3/test_suite/unit_tests/_prompt/test_pymol.py Modified: 1.3/generic_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/__init__.py?rev=11011&r1=11010&r2=11011&view=diff ============================================================================== --- 1.3/generic_fns/__init__.py (original) +++ 1.3/generic_fns/__init__.py Tue Mar 16 14:20:25 2010 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2004-2009 Edward d'Auvergne # +# Copyright (C) 2004-2010 Edward d'Auvergne # # # # This file is part of the program relax. # # # @@ -39,7 +39,7 @@ 'palmer', 'pcs', 'pipes', - 'pymol', + 'pymol_control', 'rdc', 'relax_data', 'relax_re', Modified: 1.3/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/__init__.py?rev=11011&r1=11010&r2=11011&view=diff ============================================================================== --- 1.3/prompt/__init__.py (original) +++ 1.3/prompt/__init__.py Tue Mar 16 14:20:25 2010 @@ -51,7 +51,7 @@ 'palmer', 'pcs', 'pipe', - 'pymol', + 'pymol_control', 'rdc', 'relax_data', 'relax_fit', Modified: 1.3/test_suite/unit_tests/_prompt/test_pymol.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_pymol.py?rev=11011&r1=11010&r2=11011&view=diff ============================================================================== --- 1.3/test_suite/unit_tests/_prompt/test_pymol.py (original) +++ 1.3/test_suite/unit_tests/_prompt/test_pymol.py Tue Mar 16 14:20:25 2010 @@ -24,7 +24,7 @@ from unittest import TestCase # relax module imports. -from prompt.pymol import Pymol +from prompt.pymol_control import Pymol from relax_errors import RelaxNoneStrError, RelaxNoneStrListNumError, RelaxStrError # Unit test imports.