fix python incompatibilities

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/curveopt.py b/curveopt.py
index 5b8f2de155ded9edf4639c66290e8493f856f3bd..234b2750417512bf3c0821b3523f2dd39d2ed5e3 100644 (file)
--- a/curveopt.py
+++ b/curveopt.py
@@ -32,7 +32,7 @@ class OptimisedCurve():
 
     db = DiscreteBezier(cp, nt, bezier_constructor=BezierSegment)
 
 
     db = DiscreteBezier(cp, nt, bezier_constructor=BezierSegment)
 

-    fc_input = map(db.point_at_it, range(0, nt+1))
+    fc_input = [ x for x in map(db.point_at_it, range(0, nt+1)) ]

     oc._dbg(repr(fc_input))
 
     for end in (False,True):
     oc._dbg(repr(fc_input))
 
     for end in (False,True):

diff --git a/moebius.py b/moebius.py
index 224678ad3358c1e19a79e2bf98c8a3174a4339a7..f4f37b4ab3a50543935cbc23715c5e6e030e10eb 100644 (file)
--- a/moebius.py
+++ b/moebius.py
@@ -130,7 +130,7 @@ class Moebius():
     assert(nw % 1 == 0)
     m.nv = nv
     m.nw = nw
     assert(nw % 1 == 0)
     m.nv = nv
     m.nw = nw

-    m.nt = nw/2
+    m.nt = int(nw/2)

     m.h = MoebiusHalf(nu=nv*2, nt=m.nt)
 
   def _vw2tiu_kw(m, v, w):
     m.h = MoebiusHalf(nu=nv*2, nt=m.nt)
 
   def _vw2tiu_kw(m, v, w):