r18807 - in /branches/frame_order_testing: ./ extern/scientific_python/Geometry/__init__.py -- March 12, 2013 - 19:30

Author: bugman
Date: Tue Mar 12 19:30:52 2013
New Revision: 18807

URL: http://svn.gna.org/viewcvs/relax?rev=18807&view=rev
Log:
Merged revisions 18806 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18806 | bugman | 2013-03-12 18:45:20 +0100 (Tue, 12 Mar 2013) | 5 lines
  
  Bug fix for the external Scientific Python Geometry package.
  
  This is a strange Python 3 issue only triggered when the epydoc Python 
package is installed.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 12 19:30:52 2013
@@ -1,1 +1,1 @@
-/trunk:1-18802
+/trunk:1-18806

Modified: 
branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py?rev=18807&r1=18806&r2=18807&view=diff
==============================================================================
--- 
branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py 
(original)
+++ 
branches/frame_order_testing/extern/scientific_python/Geometry/__init__.py 
Tue Mar 12 19:30:52 2013
@@ -56,8 +56,12 @@
     tm_name = TensorModule.__name__
     Vector.__module__ = 'Scientific.Geometry'
     Tensor.__module__ = 'Scientific.Geometry'
-    isVector.func_globals['__name__'] = 'Scientific.Geometry'
-    isTensor.func_globals['__name__'] = 'Scientific.Geometry'
+    if hasattr(isVector, 'func_globals'):    # Python 2.
+        isVector.func_globals['__name__'] = 'Scientific.Geometry'
+        isTensor.func_globals['__name__'] = 'Scientific.Geometry'
+    else:    # Python 3.
+        isVector.__globals__['__name__'] = 'Scientific.Geometry'
+        isTensor.__globals__['__name__'] = 'Scientific.Geometry'
     VectorModule.__name__ = vm_name
     TensorModule.__name__ = tm_name
     del VectorModule