Merge branch 'ticket638-numpy_1_7_1_test_failures_with_physicalField_…

…py' into develop Fixes ticket:638
usnistgov · Sep 11, 2013 · 96d5155 · 96d5155
2 parents ef608c0 + ae83375
commit 96d5155
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/fipy/tools/dimensions/physicalField.py b/fipy/tools/dimensions/physicalField.py
@@ -584,7 +584,11 @@ def itemset(self, value):
             >>> print a.allclose("1.8288 m")
             1
             >>> a = PhysicalField(((3.,4.),(5.,6.)),"m")
-            >>> a.itemset(PhysicalField("6 ft"))
+            >>> try:
+            ...     a.itemset(PhysicalField("6 ft"))
+            ... except IndexError:
+            ...     # NumPy 1.7 has changed the exception type
+            ...     raise ValueError("can only place a scalar for an  array of size 1")
             Traceback (most recent call last):
                 ...
             ValueError: can only place a scalar for an  array of size 1