Changeset 7009 for branches/numpy/anuga/shallow_water/data_manager.py

Timestamp:

May 11, 2009, 3:27:59 PM (16 years ago)

Author:

rwilson

Message:

Replaced 'sets' module with 'frozenset' builtin class.

File:

• branches/numpy/anuga/shallow_water/data_manager.py (modified) (2 diffs)

branches/numpy/anuga/shallow_water/data_manager.py

@@ -5003 +5003 @@
     """
 
-    from sets import ImmutableSet
-
     msg = "grid_spacing can not be zero"
     assert not grid_spacing == 0, msg
@@ -5016 +5014 @@
     # Don't assume the zone of the segments is the same as the lower left
     # corner of the lat long data!!  They can easily be in different zones
-    lat_long_set = ImmutableSet()
+    lat_long_set = frozenset()
     for seg in segs:
         points_lat_long = points_needed(seg, ll_lat, ll_long, grid_spacing,
                                         lat_amount, long_amount, zone,
                                         isSouthHemisphere)
-        lat_long_set |= ImmutableSet(points_lat_long)
-
-    if lat_long_set == ImmutableSet([]):
+        lat_long_set |= frozenset(points_lat_long)
+
+    if lat_long_set == frozenset([]):
         msg = "URS region specified and polygon does not overlap."
         raise ValueError, msg