various py3 changes; should all still work on py2.7, too

DrawBot.py

@@ -102,7 +102,7 @@ class DrawBotAppDelegate(AppKit.NSObject):
 
     def init(self):
         self = super(DrawBotAppDelegate, self).init()
-        code = stringToInt("GURL")
+        code = stringToInt(b"GURL")
         AppKit.NSAppleEventManager.sharedAppleEventManager().setEventHandler_andSelector_forEventClass_andEventID_(self, "getUrl:withReplyEvent:", code, code)
         return self
 
@@ -146,7 +146,7 @@ def showDebug_(self, sender):
     def getUrl_withReplyEvent_(self, event, reply):
         import urlparse
         import urllib2
-        code = stringToInt("----")
+        code = stringToInt(b"----")
         url = event.paramDescriptorForKeyword_(code)
         urlString = url.stringValue()
         documentController = AppKit.NSDocumentController.sharedDocumentController()

drawBot/__init__.py

@@ -1,3 +1,5 @@
-from drawBotDrawingTools import _drawBotDrawingTool
+from __future__ import absolute_import
+
+from .drawBotDrawingTools import _drawBotDrawingTool
 
 _drawBotDrawingTool._addToNamespace(globals())

drawBot/context/__init__.py

@@ -1,9 +1,11 @@
-from pdfContext import PDFContext
-from imageContext import ImageContext
-from gifContext import GifContext
-from svgContext import SVGContext
-from movContext import MOVContext
-from printContext import PrintContext
+from __future__ import absolute_import
+
+from .pdfContext import PDFContext
+from .imageContext import ImageContext
+from .gifContext import GifContext
+from .svgContext import SVGContext
+from .movContext import MOVContext
+from .printContext import PrintContext
 
 
 allContexts = [PDFContext, ImageContext, SVGContext, MOVContext, PrintContext, GifContext]

drawBot/context/baseContext.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import AppKit
 import CoreText
 import Quartz
@@ -8,8 +10,8 @@
 
 from drawBot.misc import DrawBotError, cmyk2rgb, warnings
 
-from tools import openType
-from tools import variation
+from .tools import openType
+from .tools import variation
 
 
 _FALLBACKFONT = "LucidaGrande"
@@ -333,10 +335,11 @@ def setNSBezierPath(self, path):
         """
         self._path = path
 
-    def pointInside(self, (x, y)):
+    def pointInside(self, xy):
         """
         Check if a point `x`, `y` is inside a path.
         """
+        x, y = xy
         return self._path.containsPoint_((x, y))
 
     def bounds(self):
@@ -930,7 +933,7 @@ def append(self, txt, **kwargs):
                 existingOpenTypeFeatures = openType.getFeatureTagsForFontName(self._font)
                 # sort features by their on/off state
                 # set all disabled features first
-                orderedOpenTypeFeatures = sorted(self._openTypeFeatures.items(), key=lambda (k, v): v)
+                orderedOpenTypeFeatures = sorted(self._openTypeFeatures.items(), key=lambda kv: kv[1])
                 for featureTag, value in orderedOpenTypeFeatures:
                     coreTextFeatureTag = featureTag
                     if not value:
@@ -1755,7 +1758,7 @@ def _transform(self, matrix):
     def _textBox(self, txt, box, align):
         pass
 
-    def _image(self, path, (x, y), alpha, pageNumber):
+    def _image(self, path, xy, alpha, pageNumber):
         pass
 
     def _frameDuration(self, seconds):
@@ -1770,10 +1773,10 @@ def _saveImage(self, path, multipage):
     def _printImage(self, pdf=None):
         pass
 
-    def _linkDestination(self, name, (x, y)):
+    def _linkDestination(self, name, xy):
         pass
 
-    def _linkRect(self, name, (x, y, w, h)):
+    def _linkRect(self, name, xywh):
         pass
 
     #
@@ -2185,7 +2188,8 @@ def textBox(self, txt, box, align="left"):
         self._state.path = None
         self._textBox(txt, box, align)
 
-    def image(self, path, (x, y), alpha, pageNumber):
+    def image(self, path, xy, alpha, pageNumber):
+        x, y = xy
         self._image(path, (x, y), alpha, pageNumber)
 
     def installFont(self, path):
@@ -2218,8 +2222,10 @@ def _fontNameForPath(self, path):
             psName = psName.toUnicode()
         return psName
 
-    def linkDestination(self, name, (x, y)):
+    def linkDestination(self, name, xy):
+        x, y = xy
         self._linkDestination(name, (x, y))
 
-    def linkRect(self, name, (x, y, w, h)):
+    def linkRect(self, name, xywh):
+        x, y, w, h = xywh
         self._linkRect(name, (x, y, w, h))

drawBot/context/drawBotContext.py

@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 import Quartz
 
-from pdfContext import PDFContext
+from .pdfContext import PDFContext
 
 
 class DrawBotContext(PDFContext):

drawBot/context/dummyContext.py

@@ -1,4 +1,6 @@
-from baseContext import BaseContext
+from __future__ import absolute_import, print_function
+
+from .baseContext import BaseContext
 
 
 class DummyContext(BaseContext):

drawBot/context/gifContext.py

@@ -1,11 +1,13 @@
+from __future__ import absolute_import
+
 import AppKit
 import Quartz
 
 import tempfile
 
-from imageContext import ImageContext
+from .imageContext import ImageContext
 
-from tools.gifTools import generateGif
+from .tools.gifTools import generateGif
 
 
 class GifContext(ImageContext):

drawBot/context/imageContext.py

@@ -1,9 +1,11 @@
+from __future__ import absolute_import
+
 import AppKit
 import Quartz
 
 import os
 
-from pdfContext import PDFContext
+from .pdfContext import PDFContext
 
 
 class ImageContext(PDFContext):

drawBot/context/movContext.py

@@ -1,11 +1,13 @@
+from __future__ import absolute_import
+
 import AppKit
 import QTKit
 import Quartz
 
 import os
 
 from drawBot.misc import DrawBotError
-from pdfContext import PDFContext
+from .pdfContext import PDFContext
 
 
 class MOVContext(PDFContext):

drawBot/context/pdfContext.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import platform
 from distutils.version import StrictVersion
 import AppKit
@@ -6,9 +8,9 @@
 
 import math
 
-from tools import gifTools
+from .tools import gifTools
 
-from baseContext import BaseContext, FormattedString
+from .baseContext import BaseContext, FormattedString
 from drawBot.misc import DrawBotError, isPDF, isGIF
 
 
@@ -263,7 +265,8 @@ def _getImageSource(self, key, pageNumber):
                     raise DrawBotError("No image found at %s" % key)
         return self._cachedImages[key]
 
-    def _image(self, path, (x, y), alpha, pageNumber):
+    def _image(self, path, xy, alpha, pageNumber):
+        x, y = xy
         self._save()
         _isPDF, image = self._getImageSource(path, pageNumber)
         if image is not None:
@@ -382,14 +385,16 @@ def _rgbNSColorToCGColor(self, c):
             return Quartz.CGColorCreateGenericGray(c.whiteComponent(), c.alphaComponent())
         return Quartz.CGColorCreateGenericRGB(c.redComponent(), c.greenComponent(), c.blueComponent(), c.alphaComponent())
 
-    def _linkDestination(self, name, (x, y)):
+    def _linkDestination(self, name, xy):
+        x, y = xy
         if (x, y) == (None, None):
             x, y = self.width * 0.5, self.height * 0.5
         x = max(0, min(x, self.width))
         y = max(0, min(y, self.height))
         centerPoint = Quartz.CGPoint(x, y)
         Quartz.CGPDFContextAddDestinationAtPoint(self._pdfContext, name, centerPoint)
 
-    def _linkRect(self, name, (x, y, w, h)):
+    def _linkRect(self, name, xywh):
+        x, y, w, h = xywh
         rectBox = Quartz.CGRectMake(x, y, w, h)
         Quartz.CGPDFContextSetDestinationForRect(self._pdfContext, name, rectBox)

drawBot/context/printContext.py

@@ -1,51 +1,57 @@
-from baseContext import BaseContext
+from __future__ import absolute_import, print_function
+
+from .baseContext import BaseContext
 
 
 class PrintContext(BaseContext):
 
     fileExtensions = ["*"]
 
     def _newPage(self, width, height):
-        print "newPage", width, height
+        print("newPage", width, height)
 
     def _save(self):
-        print "save"
+        print("save")
 
     def _restore(self):
-        print "restore"
+        print("restore")
 
     def _blendMode(self, operation):
-        print "blend mode", operation
+        print("blend mode", operation)
 
     def _drawPath(self):
-        print "drawPath", self._state.path
+        print("drawPath", self._state.path)
 
     def _clipPath(self):
-        print "clipPath", self._state.path
+        print("clipPath", self._state.path)
 
     def _transform(self, matrix):
-        print "transform", matrix
+        print("transform", matrix)
 
-    def _textBox(self, txt, (x, y, w, h), align):
-        print "textBox", txt, (x, y, w, h), align
+    def _textBox(self, txt, xywh, align):
+        x, y, w, h = xywh
+        print("textBox", txt, (x, y, w, h), align)
 
-    def _image(self, path, (x, y), alpha, pageNumber):
-        print "image", path, x, y, alpha, pageNumber
+    def _image(self, path, xy, alpha, pageNumber):
+        x, y = xy
+        print("image", path, x, y, alpha, pageNumber)
 
     def _frameDuration(self, seconds):
-        print "frameDuration", seconds
+        print("frameDuration", seconds)
 
     def _reset(self, other=None):
-        print "reset", other
+        print("reset", other)
 
     def _saveImage(self, path, multipage):
-        print "saveImage", path, multipage
+        print("saveImage", path, multipage)
 
     def _printImage(self, pdf=None):
-        print "printImage", pdf
+        print("printImage", pdf)
 
-    def _linkDestination(self, name, (x, y)):
-        print "linkDestination", name, (x, y)
+    def _linkDestination(self, name, xy):
+        x, y = xy
+        print("linkDestination", name, (x, y))
 
-    def _linkRect(self, name, (x, y, w, h)):
-        print "linkRect", name, (x, y, w, h)
+    def _linkRect(self, name, xywh):
+        x, y, w, h = xywh
+        print("linkRect", name, (x, y, w, h))

drawBot/context/svgContext.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import AppKit
 import CoreText
 
@@ -10,8 +12,8 @@
 
 from fontTools.misc.transform import Transform
 
-from tools.openType import getFeatureTagsForFontAttributes
-from baseContext import BaseContext, GraphicsState, Shadow, Color, FormattedString, Gradient
+from .tools.openType import getFeatureTagsForFontAttributes
+from .baseContext import BaseContext, GraphicsState, Shadow, Color, FormattedString, Gradient
 
 from drawBot.misc import warnings, formatNumber
 
@@ -433,10 +435,11 @@ def _textBox(self, txt, box, align):
         self._svgContext.newline()
         self._svgEndClipPath()
 
-    def _image(self, path, (x, y), alpha, pageNumber):
+    def _image(self, path, xy, alpha, pageNumber):
         # todo:
         # support embedding of images when the source is not a path but
         # a nsimage or a pdf / gif with a pageNumber
+        x, y = xy
         self._svgBeginClipPath()
         if path.startswith("http"):
             url = AppKit.NSURL.URLWithString_(path)