Author: semor Date: Fri Jan 11 21:01:49 2008 New Revision: 4655 URL: http://svn.gna.org/viewcvs/relax?rev=4655&view=rev Log: Reverted r4654 as it was a mistake that broke almost everything, except the prompt. The command used was: svn merge -r4654:4653 . Modified: branches/consistency_tests_1.3/generic_fns/selection.py Modified: branches/consistency_tests_1.3/generic_fns/selection.py URL: http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/selection.py?rev=4655&r1=4654&r2=4655&view=diff ============================================================================== --- branches/consistency_tests_1.3/generic_fns/selection.py (original) +++ branches/consistency_tests_1.3/generic_fns/selection.py Fri Jan 11 21:01:49 2008 @@ -30,7 +30,7 @@ from data import Data as relax_data_store from data.mol_res_spin import MoleculeContainer, ResidueContainer, SpinContainer from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoSequenceError, RelaxRegExpError, RelaxResSelectDisallowError, RelaxSpinSelectDisallowError -from generic_fns.pipes import * +from generic_fns import pipes id_string_doc = """