r9344 - in /1.3: ./ data/ generic_fns/ generic_fns/structure/ maths_fns/ opendx/ prompt/ sample_scripts/ scripts/ specific_f...r9344 - in /1.3: ./ data/ generic_fns/ generic_fns/structure/ maths_fns/ opendx/ prompt/ sample_scripts/ scripts/ specific_f...Author: bugman Date: Wed Aug 19 17:31:11 2009 New Revision: 9344 URL: http://svn.gna.org/viewcvs/relax?rev=9344&view=rev Log: Modified the behaviour of raise statements according to http://www.python.org/dev/peps/pep-3109/. This was done with the python 2.x to 3.x script with the commands: 2to3 -w -f raise relax . The change is in preparation for Python 3.0, and relax still works with Python versions 2.4, 2.5, and 2.6. Modified: 1.3/colour.py 1.3/data/__init__.py 1.3/data/align_tensor.py 1.3/data/diff_tensor.py 1.3/data/mol_res_spin.py 1.3/data/pipe_container.py 1.3/float.py 1.3/generic_fns/align_tensor.py 1.3/generic_fns/angles.py 1.3/generic_fns/dasha.py 1.3/generic_fns/diffusion_tensor.py 1.3/generic_fns/eliminate.py 1.3/generic_fns/fix.py 1.3/generic_fns/frq.py 1.3/generic_fns/grace.py 1.3/generic_fns/minimise.py 1.3/generic_fns/model_selection.py 1.3/generic_fns/mol_res_spin.py 1.3/generic_fns/molmol.py 1.3/generic_fns/monte_carlo.py 1.3/generic_fns/noesy.py 1.3/generic_fns/palmer.py 1.3/generic_fns/pcs.py 1.3/generic_fns/pipes.py 1.3/generic_fns/pymol.py 1.3/generic_fns/rdc.py 1.3/generic_fns/relax_data.py 1.3/generic_fns/results.py 1.3/generic_fns/selection.py 1.3/generic_fns/sequence.py 1.3/generic_fns/spectrum.py 1.3/generic_fns/state.py 1.3/generic_fns/structure/api_base.py 1.3/generic_fns/structure/geometric.py 1.3/generic_fns/structure/internal.py 1.3/generic_fns/structure/main.py 1.3/generic_fns/structure/scientific.py 1.3/generic_fns/temperature.py 1.3/generic_fns/value.py 1.3/generic_fns/vmd.py 1.3/generic_fns/xplor.py 1.3/maths_fns/frame_order_models.py 1.3/maths_fns/mf.py 1.3/maths_fns/n_state_model.py 1.3/opendx/base_map.py 1.3/opendx/main.py 1.3/physical_constants.py 1.3/prompt/align_tensor.py 1.3/prompt/command.py 1.3/prompt/consistency_tests.py 1.3/prompt/dasha.py 1.3/prompt/deselect.py 1.3/prompt/diffusion_tensor.py 1.3/prompt/dx.py 1.3/prompt/eliminate.py 1.3/prompt/fix.py 1.3/prompt/frame_order.py 1.3/prompt/frq.py 1.3/prompt/grace.py 1.3/prompt/interpreter.py 1.3/prompt/jw_mapping.py 1.3/prompt/minimisation.py 1.3/prompt/model_free.py 1.3/prompt/model_selection.py 1.3/prompt/molecule.py 1.3/prompt/molmol.py 1.3/prompt/monte_carlo.py 1.3/prompt/n_state_model.py 1.3/prompt/noe.py 1.3/prompt/palmer.py 1.3/prompt/pcs.py 1.3/prompt/pipe.py 1.3/prompt/pymol.py 1.3/prompt/rdc.py 1.3/prompt/relax_data.py 1.3/prompt/relax_fit.py 1.3/prompt/residue.py 1.3/prompt/results.py 1.3/prompt/select.py 1.3/prompt/sequence.py 1.3/prompt/spectrum.py 1.3/prompt/spin.py 1.3/prompt/state.py 1.3/prompt/structure.py 1.3/prompt/temperature.py 1.3/prompt/value.py 1.3/relax 1.3/relax_io.py 1.3/sample_scripts/full_analysis.py 1.3/sample_scripts/palmer.py 1.3/scripts/test_python_versions.py 1.3/specific_fns/base_class.py 1.3/specific_fns/consistency_tests.py 1.3/specific_fns/frame_order.py 1.3/specific_fns/hybrid.py 1.3/specific_fns/jw_mapping.py 1.3/specific_fns/model_free/main.py 1.3/specific_fns/model_free/mf_minimise.py 1.3/specific_fns/model_free/molmol.py 1.3/specific_fns/model_free/results.py 1.3/specific_fns/n_state_model.py 1.3/specific_fns/noe.py 1.3/specific_fns/relax_fit.py 1.3/specific_fns/setup.py 1.3/test_suite/system_tests/palmer.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.3/colour.py URL: http://svn.gna.org/viewcvs/relax/1.3/colour.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/data/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/__init__.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/data/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/align_tensor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/data/diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/diff_tensor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/data/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/mol_res_spin.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/data/pipe_container.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/float.py URL: http://svn.gna.org/viewcvs/relax/1.3/float.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/align_tensor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/angles.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/angles.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/eliminate.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/eliminate.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/fix.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/fix.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/frq.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/frq.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/grace.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/minimise.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/minimise.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/model_selection.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/mol_res_spin.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/molmol.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/monte_carlo.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/noesy.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/noesy.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pcs.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pipes.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/pymol.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pymol.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/rdc.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_data.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/results.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/selection.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/sequence.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/spectrum.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/spectrum.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/state.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/state.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/structure/api_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/api_base.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/structure/geometric.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/geometric.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/internal.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/structure/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/main.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/structure/scientific.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/temperature.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/temperature.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/vmd.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/vmd.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/generic_fns/xplor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/xplor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/maths_fns/frame_order_models.py URL: http://svn.gna.org/viewcvs/relax/1.3/maths_fns/frame_order_models.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/maths_fns/mf.py URL: http://svn.gna.org/viewcvs/relax/1.3/maths_fns/mf.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/maths_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/maths_fns/n_state_model.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/opendx/base_map.py URL: http://svn.gna.org/viewcvs/relax/1.3/opendx/base_map.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/opendx/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/opendx/main.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/physical_constants.py URL: http://svn.gna.org/viewcvs/relax/1.3/physical_constants.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/align_tensor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/command.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/command.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/consistency_tests.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/dasha.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/deselect.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/deselect.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/diffusion_tensor.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/dx.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/dx.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/eliminate.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/eliminate.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/fix.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/fix.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/frame_order.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/frame_order.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/frq.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/frq.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/grace.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/jw_mapping.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/minimisation.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/minimisation.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/model_free.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/model_selection.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/molecule.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/molecule.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/molmol.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/monte_carlo.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/n_state_model.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/noe.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/noe.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/palmer.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/pcs.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pcs.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/pipe.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pipe.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/pymol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pymol.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/rdc.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/rdc.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_data.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_fit.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/residue.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/residue.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/results.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/select.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/select.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/sequence.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/spectrum.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/spectrum.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/spin.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/state.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/state.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/structure.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/temperature.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/temperature.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/prompt/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/value.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/relax URL: http://svn.gna.org/viewcvs/relax/1.3/relax?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/relax_io.py URL: http://svn.gna.org/viewcvs/relax/1.3/relax_io.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/sample_scripts/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/full_analysis.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/sample_scripts/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/palmer.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/scripts/test_python_versions.py URL: http://svn.gna.org/viewcvs/relax/1.3/scripts/test_python_versions.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/base_class.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/consistency_tests.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/hybrid.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/hybrid.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/model_free/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/model_free/mf_minimise.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/model_free/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/molmol.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/model_free/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/results.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/noe.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/specific_fns/setup.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/setup.py?rev=9344&r1=9343&r2=9344&view=diff Modified: 1.3/test_suite/system_tests/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/palmer.py?rev=9344&r1=9343&r2=9344&view=diff