python2 compat for helixish

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

diff --git a/helixish.py b/helixish.py
index d93d75f516f59d786acdd017c0149de675746b02..cf107ff0cfb461392b5f9247af3acb2dc6a7b7ea 100644 (file)
--- a/helixish.py
+++ b/helixish.py
@@ -91,22 +91,20 @@ class HelixishCurve():
         -1
         ])
       for railway_r in railway_roots:
-        def railway_CPQ(pq, dpq):
-          nonlocal railway_r
+        def railway_CPQ(pq, dpq, railway_r):
           return pq + railway_r * [-dpq[1], dpq[0]]
 
-        railway_CP = railway_CPQ([0,0,0],       dp_plane)
-        railway_QP = railway_CPQ(q_plane[0:2], -dq_plane)
+        railway_CP = railway_CPQ([0,0,0],       dp_plane, railway_r)
+        railway_QP = railway_CPQ(q_plane[0:2], -dq_plane, railway_r)
         railway_midpt = 0.5 * (railway_CP + railway_QP)
 
         best_st = None
-        def railway_ST(C, start, end):
-          nonlocal railway_r
+        def railway_ST(C, start, end, railway_r):
           delta = atan2(*(end - C)[0:2]) - atan2(start - C)[0:2]
           s = delta * railway_r
 
-        try_s = railway_ST(railway_CP, [0,0], midpt)
-        try_t = railway_ST(railway_CP, midpt, q_plane)
+        try_s = railway_ST(railway_CP, [0,0], midpt, railway_r)
+        try_t = railway_ST(railway_CP, midpt, q_plane, railway_r)
         try_st = try_s + try_t
         if best_st is None or try_st < best_st:
           start_la = 1/r
@@ -157,7 +155,7 @@ class HelixishCurve():
         stdout=subprocess.PIPE,
         stderr=None,
         close_fds=False,
-        restore_signals=True,
+        # restore_signals=True, // want python2 compat, nnng
         universal_newlines=True,
       )
 

diff --git a/moedebug.py b/moedebug.py
index d4774f9044fcfb4676f32d7af8a2fd390a813fa5..2e0be7af2a6f798c936f79b376235d4a5ba3954a 100644 (file)
--- a/moedebug.py
+++ b/moedebug.py
@@ -1,4 +1,5 @@
 
+from __future__ import print_function
 
 _files = []
 

diff --git a/symbolic.py b/symbolic.py
index 7e9ac91f3b7e0c3063d5f31ca517de19fc848437..1c90bcacf28fbdfc0ab749954aacde18ac63dd88 100644 (file)
--- a/symbolic.py
+++ b/symbolic.py
@@ -1,4 +1,6 @@
 
+from __future__ import print_function
+
 from sympy import *
 import itertools