r19007 - in /trunk: ./ auto_analyses/ data/ generic_fns/ generic_fns/structure/ graphics/ gui/ gui/analyses/ gui/input_eleme...r19007 - in /trunk: ./ auto_analyses/ data/ generic_fns/ generic_fns/structure/ graphics/ gui/ gui/analyses/ gui/input_eleme...Author: bugman Date: Fri Mar 22 21:41:29 2013 New Revision: 19007 URL: http://svn.gna.org/viewcvs/relax?rev=19007&view=rev Log: Renamed the relax_errors module to lib.errors. This is part of the relax library redesign. Added: trunk/lib/errors.py - copied unchanged from r19003, trunk/relax_errors.py Removed: trunk/relax_errors.py Modified: trunk/arg_check.py trunk/auto_analyses/dauvergne_protocol.py trunk/auto_analyses/frame_order.py trunk/auto_analyses/stereochem_analysis.py trunk/colour.py trunk/data/__init__.py trunk/data/align_tensor.py trunk/data/diff_tensor.py trunk/data/exp_info.py trunk/data/interatomic.py trunk/data/mol_res_spin.py trunk/data/pipe_container.py trunk/data/relax_xml.py trunk/generic_fns/align_tensor.py trunk/generic_fns/angles.py trunk/generic_fns/bmrb.py trunk/generic_fns/bruker.py trunk/generic_fns/dasha.py trunk/generic_fns/diffusion_tensor.py trunk/generic_fns/dipole_pair.py trunk/generic_fns/eliminate.py trunk/generic_fns/exp_info.py trunk/generic_fns/fix.py trunk/generic_fns/frq.py trunk/generic_fns/grace.py trunk/generic_fns/interatomic.py trunk/generic_fns/minimise.py trunk/generic_fns/model_selection.py trunk/generic_fns/mol_res_spin.py trunk/generic_fns/molmol.py trunk/generic_fns/monte_carlo.py trunk/generic_fns/noesy.py trunk/generic_fns/palmer.py trunk/generic_fns/paramag.py trunk/generic_fns/pcs.py trunk/generic_fns/pipes.py trunk/generic_fns/pymol_control.py trunk/generic_fns/rdc.py trunk/generic_fns/relax_data.py trunk/generic_fns/results.py trunk/generic_fns/script.py trunk/generic_fns/selection.py trunk/generic_fns/sequence.py trunk/generic_fns/spectrum.py trunk/generic_fns/state.py trunk/generic_fns/structure/api_base.py trunk/generic_fns/structure/geometric.py trunk/generic_fns/structure/internal.py trunk/generic_fns/structure/main.py trunk/generic_fns/structure/mass.py trunk/generic_fns/structure/pdb_read.py trunk/generic_fns/structure/pdb_write.py trunk/generic_fns/structure/scientific.py trunk/generic_fns/temperature.py trunk/generic_fns/value.py trunk/generic_fns/vmd.py trunk/generic_fns/xplor.py trunk/graphics/__init__.py trunk/gui/__init__.py trunk/gui/analyses/__init__.py trunk/gui/analyses/auto_model_free.py trunk/gui/analyses/execute.py trunk/gui/input_elements/bool.py trunk/gui/input_elements/combo_list.py trunk/gui/input_elements/dir.py trunk/gui/input_elements/file.py trunk/gui/input_elements/sequence.py trunk/gui/input_elements/spin_id.py trunk/gui/input_elements/value.py trunk/gui/interpreter.py trunk/gui/misc.py trunk/gui/pipe_editor.py trunk/gui/relax_gui.py trunk/gui/spin_viewer/frame.py trunk/gui/uf_objects.py trunk/gui/wizard.py trunk/lib/text/table.py trunk/maths_fns/frame_order/__init__.py trunk/maths_fns/mf.py trunk/maths_fns/n_state_model.py trunk/opendx/base_map.py trunk/opendx/main.py trunk/physical_constants.py trunk/prompt/interpreter.py trunk/prompt/uf_objects.py trunk/relax.py trunk/relax_io.py trunk/sample_scripts/model_free/final_data_extraction.py trunk/sample_scripts/model_free/palmer.py trunk/setup.py trunk/specific_fns/api_base.py trunk/specific_fns/api_common.py trunk/specific_fns/api_objects.py trunk/specific_fns/consistency_tests.py trunk/specific_fns/frame_order.py trunk/specific_fns/hybrid.py trunk/specific_fns/jw_mapping.py trunk/specific_fns/model_free/bmrb.py trunk/specific_fns/model_free/macro_base.py trunk/specific_fns/model_free/main.py trunk/specific_fns/model_free/mf_minimise.py trunk/specific_fns/model_free/results.py trunk/specific_fns/n_state_model.py trunk/specific_fns/noe/main.py trunk/specific_fns/relax_fit.py trunk/specific_fns/setup.py trunk/status.py trunk/test_suite/gui_tests/__init__.py trunk/test_suite/gui_tests/base_classes.py trunk/test_suite/gui_tests/bruker.py trunk/test_suite/gui_tests/dead_uf_pages.py trunk/test_suite/system_tests/__init__.py trunk/test_suite/system_tests/bmrb.py trunk/test_suite/system_tests/interatomic.py trunk/test_suite/system_tests/palmer.py trunk/test_suite/system_tests/relax_fit.py trunk/test_suite/system_tests/scripts/n_state_model/data_copying.py trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py trunk/test_suite/system_tests/scripts/n_state_model/populations.py trunk/test_suite/system_tests/structure.py trunk/test_suite/unit_tests/_data/test_align_tensor.py trunk/test_suite/unit_tests/_data/test_diff_tensor.py trunk/test_suite/unit_tests/_generic_fns/test_align_tensor.py trunk/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py trunk/test_suite/unit_tests/_generic_fns/test_pipes.py trunk/test_suite/unit_tests/_prompt/test_align_tensor.py trunk/test_suite/unit_tests/_prompt/test_dasha.py trunk/test_suite/unit_tests/_prompt/test_deselect.py trunk/test_suite/unit_tests/_prompt/test_diffusion_tensor.py trunk/test_suite/unit_tests/_prompt/test_eliminate.py trunk/test_suite/unit_tests/_prompt/test_minimisation.py trunk/test_suite/unit_tests/_prompt/test_model_free.py trunk/test_suite/unit_tests/_prompt/test_molecule.py trunk/test_suite/unit_tests/_prompt/test_molmol.py trunk/test_suite/unit_tests/_prompt/test_n_state_model.py trunk/test_suite/unit_tests/_prompt/test_noe.py trunk/test_suite/unit_tests/_prompt/test_pymol.py trunk/test_suite/unit_tests/_prompt/test_relax_data.py trunk/test_suite/unit_tests/_prompt/test_relax_fit.py trunk/test_suite/unit_tests/_prompt/test_residue.py trunk/test_suite/unit_tests/_prompt/test_select.py trunk/test_suite/unit_tests/_prompt/test_sequence.py trunk/test_suite/unit_tests/_prompt/test_spectrum.py trunk/test_suite/unit_tests/_prompt/test_spin.py trunk/test_suite/unit_tests/_prompt/test_state.py trunk/test_suite/unit_tests/_prompt/test_structure.py trunk/test_suite/unit_tests/_prompt/test_value.py trunk/test_suite/unit_tests/_specific_fns/_model_free/test_main.py trunk/test_suite/unit_tests/align_tensor_testing_base.py trunk/test_suite/unit_tests/diffusion_tensor_testing_base.py trunk/test_suite/unit_tests/molecule_testing_base.py trunk/test_suite/unit_tests/residue_testing_base.py trunk/test_suite/unit_tests/spin_testing_base.py trunk/test_suite/unit_tests/value_testing_base.py trunk/user_functions/data.py trunk/user_functions/objects.py trunk/user_functions/value.py trunk/version.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/arg_check.py URL: http://svn.gna.org/viewcvs/relax/trunk/arg_check.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/auto_analyses/dauvergne_protocol.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/dauvergne_protocol.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/auto_analyses/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/auto_analyses/stereochem_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/stereochem_analysis.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/colour.py URL: http://svn.gna.org/viewcvs/relax/trunk/colour.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/__init__.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/align_tensor.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/diff_tensor.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/exp_info.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/exp_info.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/interatomic.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/interatomic.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/mol_res_spin.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/pipe_container.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/pipe_container.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/data/relax_xml.py URL: http://svn.gna.org/viewcvs/relax/trunk/data/relax_xml.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/angles.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/angles.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/bmrb.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/bruker.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/bruker.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/dasha.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/dasha.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/diffusion_tensor.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/dipole_pair.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/dipole_pair.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/eliminate.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/eliminate.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/exp_info.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/exp_info.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/fix.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/fix.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/frq.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/frq.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/grace.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/grace.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/interatomic.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/interatomic.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/minimise.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/minimise.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/model_selection.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/mol_res_spin.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/molmol.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/molmol.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/monte_carlo.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/noesy.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/noesy.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/palmer.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/paramag.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/paramag.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pcs.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pipes.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/pymol_control.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pymol_control.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/rdc.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/relax_data.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/results.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/results.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/script.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/script.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/selection.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/selection.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/sequence.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/sequence.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/spectrum.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/spectrum.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/state.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/state.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/api_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/api_base.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/geometric.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/geometric.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/internal.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/main.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/main.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/mass.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/mass.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/pdb_read.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/pdb_read.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/pdb_write.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/pdb_write.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/structure/scientific.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/scientific.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/temperature.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/temperature.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/value.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/vmd.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/vmd.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/generic_fns/xplor.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/xplor.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/graphics/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/graphics/__init__.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/__init__.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/analyses/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/__init__.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/analyses/execute.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/execute.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/bool.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/bool.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/combo_list.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/combo_list.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/dir.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/dir.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/file.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/file.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/sequence.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/sequence.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/spin_id.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/spin_id.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/input_elements/value.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/input_elements/value.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/interpreter.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/interpreter.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/misc.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/misc.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/pipe_editor.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/pipe_editor.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/relax_gui.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/relax_gui.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/spin_viewer/frame.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/spin_viewer/frame.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/uf_objects.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/gui/wizard.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/wizard.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/lib/text/table.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/text/table.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/maths_fns/frame_order/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/maths_fns/mf.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/mf.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/maths_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/n_state_model.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/opendx/base_map.py URL: http://svn.gna.org/viewcvs/relax/trunk/opendx/base_map.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/opendx/main.py URL: http://svn.gna.org/viewcvs/relax/trunk/opendx/main.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/physical_constants.py URL: http://svn.gna.org/viewcvs/relax/trunk/physical_constants.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/interpreter.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/prompt/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/uf_objects.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/relax.py URL: http://svn.gna.org/viewcvs/relax/trunk/relax.py?rev=19007&r1=19006&r2=19007&view=diff Removed: trunk/relax_errors.py URL: http://svn.gna.org/viewcvs/relax/trunk/relax_errors.py?rev=19006&view=auto Modified: trunk/relax_io.py URL: http://svn.gna.org/viewcvs/relax/trunk/relax_io.py?rev=19007&r1=19006&r2=19007&view=diff Modified: trunk/sample_scripts/model_free/final_data_extraction.py [... 215 lines stripped ...]