r18738 - /trunk/generic_fns/interatomic.py -- March 10, 2013 - 15:44

Author: bugman
Date: Sun Mar 10 15:44:44 2013
New Revision: 18738

URL: http://svn.gna.org/viewcvs/relax?rev=18738&view=rev
Log:
Reverted the last revision (r18737) as it was not correct and RelaxErrors 
should be used instead.

The command used was:
svn merge -r18737:18736 .


Modified:
    trunk/generic_fns/interatomic.py

Modified: trunk/generic_fns/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/interatomic.py?rev=18738&r1=18737&r2=18738&view=diff
==============================================================================
--- trunk/generic_fns/interatomic.py (original)
+++ trunk/generic_fns/interatomic.py Sun Mar 10 15:44:44 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2012-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2012 Edward d'Auvergne                                       
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -32,7 +32,6 @@
 from generic_fns.mol_res_spin import Selection, count_spins, return_spin, 
spin_loop
 from relax_errors import RelaxError, RelaxInteratomError, 
RelaxInteratomInconsistentError, RelaxNoInteratomError, RelaxNoSpinError
 from relax_io import write_data
-from relax_warnings import RelaxNoSpinWarning
 
 
 def copy(pipe_from=None, pipe_to=None, spin_id1=None, spin_id2=None, 
verbose=True):