quick & dirty pass at updating to python3

Author: samizdatco

Diff for: ants/examples/ants.pv

@@ -1,10 +1,4 @@
-import importlib
-try:
-    ants = ximport("ants")
-except:
-    ants = ximport("__init__")
-    importlib.reload(ants)
-
+import ants
 
 size(500,500)
 speed(200)

Diff for: cornu/examples/cornu-1.pv

@@ -1,9 +1,4 @@
-import importlib
-try:
-    cornu = ximport("cornu")
-except:
-    cornu = ximport("__init__")
-    importlib.reload(cornu)
+import cornu
 
 size(600,600)
 

Diff for: cornu/examples/cornu-2.pv

@@ -1,13 +1,8 @@
-import importlib
 # Interactive Cornu editor.
 # Click and drag points on the canvas.
 # Your work will be saved as an SVG-file in this folder.
 
-try:
-    cornu = ximport("cornu")
-except:
-    cornu = ximport("__init__")
-    importlib.reload(cornu)
+import cornu
 
 points = []
 drag = None

Diff for: flowerewolf/examples/flowerewolf.pv

@@ -1,7 +1,7 @@
 # Note: you'll also need the NodeBox English Linguistics library:
 # http://nodebox.net/code/index.php/Linguistics
 
-flowerewolf = ximport("__init__")
+import flowerewolf
 
 var("topic", TEXT, "kiss")
 size(600,700)

Diff for: google/google_test.py renamed to google/examples/google.pv

@@ -1,18 +1,10 @@
 from urllib.request import urlopen
 import re
-import importlib
 
 size(500, 500)
 background(0.2,0.5,0)
 
-# Import the Google library
-try: 
-    # This is the statement you normally use.
-    google = ximport("google")
-except:
-    # From inside the library folder.
-    google = ximport("__init__")
-    importlib.reload(google)
+import google
 
 # Set the license key
 google.license("<your license key>")

Diff for: graph/examples/graph-1.pv

@@ -1,14 +1,4 @@
-import importlib
-# Import the library
-try:
-    # This is the statement you normally use.
-    graph = ximport("graph")
-except ImportError:
-    # But since these examples are "inside" the library
-    # we may need to try something different when
-    # the library is not located in /Application Support
-    graph = ximport("__init__")
-    importlib.reload(graph)
+import graph
 
 size(500, 500)
 

Diff for: graph/examples/graph-2.pv

@@ -1,9 +1,4 @@
-import importlib
-try:
-    graph = ximport("graph")
-except ImportError:
-    graph = ximport("__init__")
-    importlib.reload(graph)
+import graph
 
 size(600, 600)
 

Diff for: graph/examples/graph-3.pv

@@ -1,9 +1,4 @@
-import importlib
-try:
-    graph = ximport("graph")
-except ImportError:
-    graph = ximport("__init__")
-    importlib.reload(graph)
+import graph
 
 size(500, 500)
 

Diff for: graph/examples/graph-4.pv

@@ -5,12 +5,7 @@
 
 query = "bird"
 
-try:
-    graph = ximport("graph")
-except ImportError:
-    graph = ximport("__init__")
-    importlib.reload(graph)
-
+import graph
 import en
 from random import shuffle
 import importlib

Diff for: grid/examples/grid-1.pv

@@ -1,14 +1,4 @@
-import importlib
-# Import the library
-try: 
-    # This is the statement you normally use.
-    grid = ximport("grid")
-except:
-    # But since this example is "inside" the library
-    # we may need to try something different when
-    # the library is not located in /Application Support
-    grid = ximport("__init__")
-    importlib.reload(grid)
+import grid
 
 g = grid.create(3, 1, width=400, height=500)
 g.bottom.split(1, 3)

Diff for: grid/examples/grid-2.pv

@@ -1,11 +1,6 @@
-import importlib
 # IMAGE GRID
 
-try: 
-    grid = ximport("grid")
-except:
-    grid = ximport("__init__")
-    importlib.reload(grid)
+import grid
 
 # Play around with the rows, columns, width and height.
 # With the g.styles.fit = True defined below,

Diff for: grid/examples/grid-3.pv

@@ -1,9 +1,4 @@
-import importlib
-try: 
-    grid = ximport("grid")
-except:
-    grid = ximport("__init__")
-    importlib.reload(grid)
+import grid
 
 w, h = grid.format.A4
 size(w+0, h+0)

Diff for: grid/proportion.py

@@ -72,21 +72,25 @@ def generate(self, n):
         
         """
 
+        print('N', n)
         r = max(1, self.repetition)
-        
+        print('R',r)
+        n = float(n)
+        r = float(r)
+
         if isinstance(n, list):
             list.__init__(self, n)
         elif n <= 0:
             list.__init__(self, [])
         elif n == 1:
             list.__init__(self, [1.0])
         elif self.distribution == PROPORTION_RANDOM:
-            list.__init__(self, [random() for i in range(n/r)])
+            list.__init__(self, [random() for i in range(int(n//r))])
         elif self.distribution in (PROPORTION_EVEN):
-            list.__init__(self, [1.0/n for i in range(n/r)])
+            list.__init__(self, [1.0/float(n) for i in range(int(n//r))])
         elif self.distribution in (PROPORTION_FIBONACCI, PROPORTION_FIB):
             # Values distributed according to the golden ratio.
-            list.__init__(self, [self.fib(i) for i in range(2,(n/r)+2)])  
+            list.__init__(self, [self.fib(i) for i in range(2,(int(n//r))+2)])
         elif self.distribution == PROPORTION_CONTRAST:
             # Split the range: 80% are 0.05-0.15 value and 20% are 0.85-1.0 values.
             i = max(1, int(round((n/r) * 0.2)))
@@ -97,8 +101,8 @@ def generate(self, n):
                 self.append(random()*0.1+0.05)
 
         # Repeat the range and assert that the list has n elements.
-        self *= r
-        for i in range(n-len(self)):
+        self *= int(r)
+        for i in range(int(n)-len(self)):
             self.append(self[i])
 
         self.relativize()

Diff for: grid/style.py

@@ -415,7 +415,7 @@ def draw_background(style, grob, path, x, y, width, height):
     # If a background gradient is defined, attempt to import the Colors library.
     if style.background.gradient:
         try:
-            colors = style._ctx.ximport("colors")
+            import colors
             g = style.background.gradient
             clr1   = g[0]
             clr2   = g[1]
@@ -446,7 +446,8 @@ def draw_content(style, grob, x, y, width, height):
 
     # hack the local redefs of alignment args back to plotdevice's values
     from plotdevice.gfx import LEFT, RIGHT, CENTER, JUSTIFY
-    style._ctx.align([LEFT, RIGHT, CENTER, JUSTIFY][style.horizontal])
+    print("TO", style.horizontal, alignment(style.horizontal))
+    style._ctx.align([LEFT, RIGHT, CENTER, JUSTIFY][alignment(style.horizontal)])
     # style._ctx.align(alignment(style.horizontal))
 
     # Content rotation.

Diff for: grid/text.py

@@ -170,13 +170,13 @@ def split(txt, width, height, widows=1, orphans=1, forward=True):
 
     # Splitter parameters.
     d = 1.6
-    if _ctx.fontsize > 20: d = 1.15
+    if _ctx.font().size > 20: d = 1.15
 
     # Approximate by cutting in large chunks a few times.
     # When it gets down to chunks increasing or decreasing by 10 characters,
     # proceed from word to word.
     h = _ctx.textheight(txt[:i], width)
-    while abs(h - height) > _ctx.fontsize():
+    while abs(h - height) > _ctx.font().size:
         if abs(i/m) < 10: break # Increase or decrease becomes too small.
         if h >  height: i -= i/m; m *= d
         if h <= height: i += i/m
@@ -230,8 +230,8 @@ def legible_width(txt, chars=70):
     Assumes an optimal of 70 characters per line at fontsize 10pt.
     Smaller lineheight furthermore decreases the width.
     """
-    fs = _ctx.fontsize()
-    _ctx.fontsize(10)
+    fs = _ctx.font().size
+    _ctx.font(size=10)
     str = ""
     for i in range(chars):
         str += choice("abcdefghijklmnopqrstuvwxyz ")
@@ -240,7 +240,7 @@ def legible_width(txt, chars=70):
     w *= _ctx.lineheight() / 1.2
     if txt == txt.upper():
         w *= 1.5
-    _ctx.fontsize(fs)
+    _ctx.font(size=fs)
     return w
 
 #### FIT FONTSIZE ####################################################################################
@@ -252,19 +252,19 @@ def fit_fontsize(str, width, height):
     # E.g. if a word contains no descenders (Goo vs. goo) there is more room at the bottom to scale.
     def increase(str, width, height, factor):
         while _ctx.textheight(str, width) < height:
-            _ctx.fontsize(_ctx.fontsize()+factor)
+            _ctx.font(size=_ctx.font().size + factor)
     def decrease(str, width, height, factor):
-        while _ctx.textheight(str, width) > height and _ctx.fontsize() > 0:
-            _ctx.fontsize(_ctx.fontsize()-factor)
+        while _ctx.textheight(str, width) > height and _ctx.font().size > 0:
+            _ctx.font(size = _ctx.fontsize() - factor)
     if str == "" or width < 1 or height < 1:
         return 0.0001
-    fs = _ctx.fontsize()
+    fs = _ctx.font().size
     increase(str, width, height, 10)
     decrease(str, width, height, 3)
     increase(str, width, height, 1)
     decrease(str, width, height, 1)
-    x = _ctx.fontsize()
-    _ctx.fontsize(fs)
+    x = _ctx.font().size
+    _ctx.font(size=fs)
     return max(x, 0.0001)
 
 def fit_lineheight(str, width, height):
@@ -278,7 +278,7 @@ def decrease(str, width, height, factor):
             _ctx.lineheight(_ctx.lineheight()-factor)
     if _ctx.textheight(str, width) <= _ctx.textheight(" ") \
     or _ctx.textheight(str, width) <= 1 \
-    or _ctx.fontsize() < 1:
+    or _ctx.font().size < 1:
         return _ctx.lineheight()
     if str == "" or width < 1 or height < 1:
         return 0.0001