r17638 - /trunk/extern/scientific_python/Geometry/__init__.py -- October 01, 2012 - 23:06

Author: bugman
Date: Mon Oct  1 23:06:27 2012
New Revision: 17638

URL: http://svn.gna.org/viewcvs/relax?rev=17638&view=rev
Log:
Python 2 fixes - the Python 3 fixes for the ScientificPython module imports 
broke Python 2.


Modified:
    trunk/extern/scientific_python/Geometry/__init__.py

Modified: trunk/extern/scientific_python/Geometry/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/scientific_python/Geometry/__init__.py?rev=17638&r1=17637&r2=17638&view=diff
==============================================================================
--- trunk/extern/scientific_python/Geometry/__init__.py (original)
+++ trunk/extern/scientific_python/Geometry/__init__.py Mon Oct  1 23:06:27 
2012
@@ -21,15 +21,13 @@
 # Pretend that Vector and Tensor are defined directly
 # in Scientific.Geometry.
 
-import extern.scientific_python.Geometry.VectorModule
+from extern.scientific_python.Geometry import VectorModule
 Vector = VectorModule.Vector
 isVector = VectorModule.isVector
-del VectorModule
 
-import extern.scientific_python.Geometry.TensorModule
+from extern.scientific_python.Geometry import TensorModule
 Tensor = TensorModule.Tensor
 isTensor = TensorModule.isTensor
-del TensorModule
 
 # Some useful constants
 ex = Vector(1., 0., 0.)
@@ -52,7 +50,6 @@
 
 import sys
 if 'epydoc' in sys.modules:
-    import extern.scientific_python.Geometry.VectorModule, 
extern.scientific_python.Geometry.TensorModule
     Vector = VectorModule.Vector
     isVector = VectorModule.isVector
     vm_name = VectorModule.__name__