[Yt-svn] yt-commit r937 - in branches/yt-non-3d: tests yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Sat Nov 15 15:31:36 2008
New Revision: 937
URL: http://yt.spacepope.org/changeset/937

Log:
More bug fixes for non-3d



Modified:
   branches/yt-non-3d/tests/test_lagos.py
   branches/yt-non-3d/yt/lagos/HierarchyType.py

Modified: branches/yt-non-3d/tests/test_lagos.py
==============================================================================
--- branches/yt-non-3d/tests/test_lagos.py	(original)
+++ branches/yt-non-3d/tests/test_lagos.py	Sat Nov 15 15:31:36 2008
@@ -2,7 +2,7 @@
 Test that we can get outputs, and interact with them in some primitive ways.
 """
 
-# @TODO: Add unit test for deleting field from fieldInfo
+# @TODO: Add unit test for deleting field from FieldInfo
 
 import unittest, glob, os.path, os, sys, StringIO
 
@@ -190,7 +190,8 @@
         self.assertEqual(len(cid), 3)
 
 
-for field in yt.lagos.fieldInfo.values():
+for field_name in yt.lagos.FieldInfo:
+    field = yt.lagos.FieldInfo[field_name]
     setattr(DataTypeTestingBase, "test%s" % field.name, _returnFieldFunction(field))
 
 field = "Temperature"

Modified: branches/yt-non-3d/yt/lagos/HierarchyType.py
==============================================================================
--- branches/yt-non-3d/yt/lagos/HierarchyType.py	(original)
+++ branches/yt-non-3d/yt/lagos/HierarchyType.py	Sat Nov 15 15:31:36 2008
@@ -854,16 +854,16 @@
             self.save_data(list(field_list),"/","DataFields")
         self.field_list = list(field_list)
         for field in self.field_list:
-            if field in self.pf.field_info: continue
+            if field in self.parameter_file.field_info: continue
             mylog.info("Adding %s to list of fields", field)
             cf = None
             if self.parameter_file.has_key(field):
                 cf = lambda d: d.convert(field)
             add_field(field, lambda a, b: None, convert_function=cf)
         self.derived_field_list = []
-        for field in self.pf.field_info:
+        for field in self.parameter_file.field_info:
             try:
-                fd = self.pf.field_info[field].get_dependencies(pf = self.parameter_file)
+                fd = self.parameter_file.field_info[field].get_dependencies(pf = self.parameter_file)
             except:
                 continue
             available = na.all([f in self.field_list for f in fd.requested])