[Scipy-svn] r2411 - trunk/Lib/sandbox/models

[scipy-svn at scipy.org]

Author: jonathan.taylor
Date: 2006-12-14 10:31:20 -0600 (Thu, 14 Dec 2006)
New Revision: 2411

Modified:
   trunk/Lib/sandbox/models/formula.py
Log:
another namespace fix


Modified: trunk/Lib/sandbox/models/formula.py
===================================================================
--- trunk/Lib/sandbox/models/formula.py	2006-12-14 16:29:35 UTC (rev 2410)
+++ trunk/Lib/sandbox/models/formula.py	2006-12-14 16:31:20 UTC (rev 2411)
@@ -286,7 +286,11 @@
     of the columns of the two formulas.
     """
     
-    def _get_namespace(self):  return self.__namespace or default_namespace
+    def _get_namespace(self): 
+	if isinstance(self.__namespace, N.ndarray): 
+	    return self.__namespace 
+	else: return self.__namespace or default_namespace
+
     def _set_namespace(self, value):  self.__namespace = value
     def _del_namespace(self): del self.__namespace
     namespace = property(_get_namespace, _set_namespace, _del_namespace)