|
152 | 152 | import types
|
153 | 153 | import collections
|
154 | 154 | from base64 import standard_b64decode
|
| 155 | +from six.moves import range |
155 | 156 |
|
156 | 157 | # Sage libraries
|
157 | 158 | from sagenb.misc.misc import sage_eval, Color, is_Matrix
|
@@ -1182,7 +1183,7 @@ def __init__(self, var, rows, columns, default_value=None, label=None,
|
1182 | 1183 | if type(default_value) != list:
|
1183 | 1184 | default_value = [[default_value for _ in range(columns)] for _ in range(rows)]
|
1184 | 1185 | elif not all(type(elt) == list for elt in default_value):
|
1185 |
| - default_value = [[default_value[i * columns + j] for j in xrange(columns)] for i in xrange(rows)] |
| 1186 | + default_value = [[default_value[i * columns + j] for j in range(columns)] for i in range(rows)] |
1186 | 1187 |
|
1187 | 1188 | self.__default_value_grid = default_value
|
1188 | 1189 |
|
@@ -2550,7 +2551,7 @@ def interact(f, layout=None, width='800px'):
|
2550 | 2551 |
|
2551 | 2552 | A random polygon::
|
2552 | 2553 |
|
2553 |
| - sage: pts = [(random(), random()) for _ in xrange(20)] |
| 2554 | + sage: pts = [(random(), random()) for _ in range(20)] |
2554 | 2555 | sage: @interact
|
2555 | 2556 | ....: def _(n = (4..len(pts)), c=Color('purple') ):
|
2556 | 2557 | ....: G = points(pts[:n],pointsize=60) + polygon(pts[:n], rgbcolor=c)
|
@@ -2607,7 +2608,7 @@ def interact(f, layout=None, width='800px'):
|
2607 | 2608 | ....: def _(n=(500,(100,5000,1)), p=(1,(0.1,10))):
|
2608 | 2609 | ....: n = int(n)
|
2609 | 2610 | ....: if n not in data:
|
2610 |
| - ....: data[n] = [(random(), random()) for _ in xrange(n)] |
| 2611 | + ....: data[n] = [(random(), random()) for _ in range(n)] |
2611 | 2612 | ....: show(points([(x^p,y^p) for x,y in data[n]], rgbcolor='black'), xmin=0, ymin=0, axes=False)
|
2612 | 2613 | <html>...
|
2613 | 2614 |
|
|
0 commit comments