X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Fsymbol_sequence.py;h=977add638b001f6956b3e8af691a51a2ebf63fec;hb=16dfa403c6eb709d3a5188a0f19919652b6a225d;hp=b7c438fa02fda1702f6df4fd5a6f1b3a41fce7b0;hpb=0f82bb9c56eb8c7069e20e1948504deac213169e;p=sage.d.git

diff --git a/mjo/symbol_sequence.py b/mjo/symbol_sequence.py
index b7c438f..977add6 100644
--- a/mjo/symbol_sequence.py
+++ b/mjo/symbol_sequence.py
@@ -38,7 +38,7 @@ class SymbolSequence:
     degree::
 
         sage: a = SymbolSequence('a')
-        sage: p = sum( a[i]*x^i for i in range(5) )
+        sage: p = sum( a[i]*x^i for i in xrange(5) )
         sage: p
         a_4*x^4 + a_3*x^3 + a_2*x^2 + a_1*x + a_0
 
@@ -57,7 +57,7 @@ class SymbolSequence:
         a_0_1_2
         sage: latex(a[0,1,2])
         a_{0}_{1}_{2}
-        sage: [ a[i,j] for i in range(0,2) for j in range(0,2) ]
+        sage: [ a[i,j] for i in xrange(2) for j in xrange(2) ]
         [a_0_0, a_0_1, a_1_0, a_1_1]
 
     You can pass slices instead of integers to obtain a list of
@@ -175,9 +175,10 @@ class SymbolSequence:
         result = []
 
         for item in l:
-            if isinstance(item, list):
+            try:
+                item = iter(item)
                 result += self._flatten_list_(item)
-            else:
+            except TypeError:
                 result += [item]
 
         return result
@@ -283,7 +284,7 @@ class SymbolSequence:
         # If the user asks for a slice, we'll be returning a list
         # of symbols.
         return [ self._subscript_integer_(idx)
-                 for idx in range(start, s.stop, step) ]
+                 for idx in xrange(start, s.stop, step) ]
 
 
 
@@ -332,7 +333,7 @@ class SymbolSequence:
                    for w in v )
 
             # This might be nested...
-            maybe_nested_list = [ s._subscript_tuple_(args) for s in ss ]
+            maybe_nested_list = ( s._subscript_tuple_(args) for s in ss )
             return self._flatten_list_(maybe_nested_list)
 
         else: