Changed the name of iterator to callable.

src/sage/combinat/species/cycle_species.py

@@ -177,7 +177,7 @@ def _isotypes(self, structure_class, labels):
         if len(labels) != 0:
             yield structure_class(self, labels, range(1, len(labels)+1))
 
-    def _gs_iterator(self, base_ring, n):
+    def _gs_callable(self, base_ring, n):
         r"""
         The generating series for cyclic permutations is
         `-\log(1-x) = \sum_{n=1}^\infty x^n/n`.
@@ -235,7 +235,7 @@ def _itgs_list(self, base_ring, n):
         """
         return base_ring(0) if n == 0 else self._weight*base_ring(1)
 
-    def _cis_iterator(self, base_ring):
+    def _cis_callable(self, base_ring):
         r"""
         The cycle index series of the species of cyclic permutations is
         given by

src/sage/combinat/species/linear_order_species.py

@@ -152,7 +152,7 @@ def _itgs_list(self, base_ring, n):
         return base_ring(1)
 
 
-    def _cis_iterator(self, base_ring):
+    def _cis_callable(self, base_ring, n):
         """
         EXAMPLES::
 

src/sage/combinat/species/partition_species.py

@@ -233,7 +233,7 @@ def _canonical_rep_from_partition(self, structure_class, labels, p):
         breaks = [sum(p[:i]) for i in range(len(p) + 1)]
         return structure_class(self, labels, [list(range(breaks[i]+1, breaks[i+1]+1)) for i in range(len(p))])
 
-    def _gs_iterator(self, base_ring, n):
+    def _gs_callable(self, base_ring, n):
         r"""
         EXAMPLES::
 
@@ -245,7 +245,7 @@ def _gs_iterator(self, base_ring, n):
         from sage.combinat.combinat import bell_number
         return self._weight * base_ring(bell_number(n) / factorial(n))
 
-    def _itgs_iterator(self, base_ring, n):
+    def _itgs_callable(self, base_ring, n):
         r"""
         The isomorphism type generating series is given by
         `\frac{1}{1-x}`.

src/sage/combinat/species/permutation_species.py

@@ -201,7 +201,7 @@ def _gs_list(self, base_ring, n):
         return base_ring(1)
 
 
-    def _itgs_iterator(self, base_ring, n):
+    def _itgs_callable(self, base_ring, n):
         r"""
         The isomorphism type generating series is given by
         `\frac{1}{1-x}`.
@@ -213,9 +213,6 @@ def _itgs_iterator(self, base_ring, n):
             sage: [g.coefficient(i) for i in range(10)]
             [1, 1, 2, 3, 5, 7, 11, 15, 22, 30]
         """
-        # from sage.combinat.partition import number_of_partitions
-        # for n in _integers_from(0):
-        #     yield base_ring(number_of_partitions(n))
         from sage.combinat.partition import number_of_partitions
         return base_ring(number_of_partitions(n))
 

src/sage/combinat/species/set_species.py

@@ -130,7 +130,7 @@ def _structures(self, structure_class, labels):
 
     _isotypes = _structures
 
-    def _gs_iterator(self, base_ring, n):
+    def _gs_callable(self, base_ring, n):
         r"""
         The generating series for the species of sets is given by
         `e^x`.
@@ -144,8 +144,6 @@ def _gs_iterator(self, base_ring, n):
             sage: [g.count(i) for i in range(10)]
             [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
         """
-        # for n in _integers_from(0):
-        #     yield base_ring(self._weight / factorial(n))
         return base_ring(self._weight / factorial(n))
 
     def _itgs_list(self, base_ring, n):

src/sage/combinat/species/species.py

@@ -555,16 +555,16 @@ def _series_helper(self, series_ring_class, prefix, base_ring=None):
         except AttributeError:
             pass
 
-        # Try to return things like self._gs_iterator(base_ring).
-        # This is used when the subclass just provides an iterator
+        # Try to return things like self._gs_callable(base_ring).
+        # This is used when the subclass just provides an callable
         # for the coefficients of the generating series.  Optionally,
         # the subclass can specify the order of the series.
         try:
-            iterator = getattr(self, prefix + "_iterator")
+            callable = getattr(self, prefix + "_callable")
             try:
-                return series_ring(lambda n: iterator(base_ring, n), valuation=self._order())
+                return series_ring(lambda n: callable(base_ring, n), valuation=self._order())
             except AttributeError:
-                return series_ring(lambda n: iterator(base_ring, n))
+                return series_ring(lambda n: callable(base_ring, n))
         except AttributeError:
             pass
 

src/sage/combinat/species/subset_species.py

@@ -187,7 +187,7 @@ def _isotypes(self, structure_class, labels):
         for i in range(len(labels)+1):
             yield structure_class(self, labels, range(1, i+1))
 
-    def _gs_iterator(self, base_ring, n):
+    def _gs_callable(self, base_ring, n):
         """
         The generating series for the species of subsets is
         `e^{2x}`.
@@ -199,10 +199,8 @@ def _gs_iterator(self, base_ring, n):
             [1, 2, 2, 4/3, 2/3]
         """
         return base_ring(2)**n / base_ring(factorial(n))
-        # for n in _integers_from(0):
-        #     yield base_ring(2)**n / base_ring(factorial(n))
 
-    def _itgs_iterator(self, base_ring, n):
+    def _itgs_callable(self, base_ring, n):
         r"""
         The generating series for the species of subsets is
         `e^{2x}`.