-

cool-RR · cool-RR · commit 7f6dc67b0ec3 · 2010-11-29T00:15:15.000+02:00
diff --git a/garlicsim/garlicsim/asynchronous_crunching/crunching_manager.py b/garlicsim/garlicsim/asynchronous_crunching/crunching_manager.py
@@ -89,8 +89,14 @@ def __init__(self, project):
         job they're working on has changed.
         '''
         
-        self.cruncher_type = \
-            self.project.simpack_grokker.available_cruncher_types[0]
+        try:
+            self.cruncher_type = \
+                self.project.simpack_grokker.available_cruncher_types[0]
+        except IndexError:
+            raise garlicsim.misc.GarlicSimException(
+                "The `%s` simpack doesn't allow using any of the cruncher "
+                "types we have installed." % self.project.simpack.__name__
+            )
         
         
     @with_tree_lock
diff --git a/garlicsim/garlicsim/general_misc/misc_tools.py b/garlicsim/garlicsim/general_misc/misc_tools.py
@@ -10,6 +10,16 @@
 from . import import_tools
 
 
+def is_subclass(candidate, base_class):
+    '''
+    You may pass in a tuple of base classes instead of just one, and it will
+    check whether `candidate` is a subclass of any of these base classes.
+    '''
+    # The reason to use this wrapper is that `issubclass` sometimes fails on
+    # non-type candidates. (Python issue 10569.)
+    return isinstance(candidate, (type, types.ClassType)) and \
+           issubclass(candidate, base_class)
+
 def frange(start, finish=None, step=1.):
     '''
     Make a list containing an arithmetic progression of numbers.
diff --git a/garlicsim/garlicsim/misc/simpack_grokker/simpack_grokker.py b/garlicsim/garlicsim/misc/simpack_grokker/simpack_grokker.py
@@ -57,7 +57,7 @@ def __init_analysis(self):
             raise InvalidSimpack("The %s simpack does not define a `State` "
                                  "class." % simpack.__name__)
         
-        if not issubclass(State, garlicsim.data_structures.State):
+        if not misc_tools.is_subclass(State, garlicsim.data_structures.State):
             raise InvalidSimpack("The %s simpack defines a State class, but "
                                  "it's not a subclass of "
                                  "`garlicsim.data_structures.State`." % \
@@ -200,7 +200,7 @@ def __init_analysis_cruncher_types(self):
             ###################################################################
 
         
-        elif isinstance(CRUNCHERS, BaseCruncher):
+        elif misc_tools.is_subclass(CRUNCHERS, BaseCruncher):
             cruncher_type = CRUNCHERS
             self.available_cruncher_types = [cruncher_type]
             self.cruncher_types_availability[cruncher_type] = True
@@ -226,16 +226,16 @@ def __init_analysis_cruncher_types(self):
             ###################################################################
             
         
-        elif cute_iter_tools.is_iterable(CRUNCHERS):            
+        elif cute_iter_tools.is_iterable(CRUNCHERS):
             self.available_cruncher_types = []
             for item in CRUNCHERS:
                 if isinstance(item, basestring):
-                    cruncher_type = \
+                    (cruncher_type,) = \
                         [cruncher_type_ for cruncher_type_ in
                          crunchers.cruncher_types_list if
                          cruncher_type_.__name__ == item]
                 else:
-                    assert isinstance(item, BaseCruncher)
+                    assert misc_tools.is_subclass(item, BaseCruncher)
                     cruncher_type = item
                 self.available_cruncher_types.append(cruncher_type)
                 self.cruncher_types_availability[cruncher_type] = True
@@ -268,7 +268,6 @@ def __init_analysis_cruncher_types(self):
                 [cruncher_type_ for cruncher_type_ in
                  crunchers.cruncher_types_list if
                  CRUNCHERS(cruncher_type_)]
-            self.cruncher_type = self.available_cruncher_types[0]
             for available_cruncher_type in self.available_cruncher_types:
                 self.cruncher_types_availability[available_cruncher_type] = \
                     True
diff --git a/garlicsim_lib/garlicsim_lib/simpacks/life/settings.py b/garlicsim_lib/garlicsim_lib/simpacks/life/settings.py
@@ -1,5 +1,6 @@
 from life import *
 
 DETERMINISM_FUNCTION = determinism_function
+
 #SCALAR_STATE_FUNCTIONS = [State.get_n_live_cells]
 #SCALAR_HISTORY_FUNCTIONS = [changes]
