py3 only

Author: typemytype

Lib/defconAppKit/controls/featureTextEditor.py

@@ -5,7 +5,7 @@
     NSNumberFormatter, NSNumber, NSFocusRingTypeNone, NSUnionRect
 import vanilla
 from vanilla.vanillaTextEditor import VanillaTextEditorDelegate
-from vanilla.py23 import python_method
+from objc import python_method
 from defconAppKit.controls.placardScrollView import DefconAppKitPlacardNSScrollView, PlacardPopUpButton
 from defconAppKit.windows.popUpWindow import InteractivePopUpWindow
 from defconAppKit.tools.featureTextTools import breakFeatureTextIntoRuns, findBlockOpenLineStarts

Lib/defconAppKit/controls/fontInfoView.py

@@ -1,9 +1,3 @@
-from fontTools.misc.py23 import *
-try:
-    long
-except:
-    # py3 has no long
-    long = int
 import time
 from copy import deepcopy
 from Foundation import NSArray
@@ -12,7 +6,7 @@
     NSDecimalNumber, NSString, NSInsetRect, NSNumberFormatter, NSPointInRect, NSMaxY, NSNull, NSWarningAlertStyle, \
     NSMutableIndexSet, NSSegmentedCell, NSRectFill
 import vanilla
-from vanilla.py23 import python_method
+from objc import python_method
 from vanilla import dialogs
 from vanilla.vanillaList import VanillaTableViewSubclass
 from ufo2fdk.fontInfoData import getAttrWithFallback, dateStringToTimeValue
@@ -1236,9 +1230,7 @@ def openTypeGaspRangeRecordsToUFO(value):
         sorter[ppem] = item
     records = []
     for ppem, item in sorted(sorter.items()):
-        if isinstance(ppem, long):
-            ppem = int(ppem)
-        elif isinstance(ppem, NSDecimalNumber):
+        if isinstance(ppem, NSDecimalNumber):
             ppem = int(ppem.intValue())
         behavior = []
         if item["gridfit"]:
@@ -1259,9 +1251,7 @@ def openTypeGaspRangeRecordsInputValidator(records):
     ppems = []
     for record in records:
         ppem = record["ppem"]
-        if isinstance(ppem, long):
-            ppem = int(ppem)
-        elif isinstance(ppem, NSDecimalNumber):
+        if isinstance(ppem, NSDecimalNumber):
             ppem = int(ppem.intValue())
         if ppem in ppems:
             return False, "A duplicate PPEM %d record has been created." % ppem, "Duplicate PPEM records aren't allowed. Only the final PPEM %d record will be stored in the font." % ppem
@@ -3708,8 +3698,6 @@ def _controlEditCallback(self, sender):
             pass
         elif isinstance(value, NSArray):
             value = list(value)
-        elif isinstance(value, long):
-            value = int(value)
         if conversionFunction is not None:
             value = conversionFunction(value)
         # set

Lib/defconAppKit/controls/glyphCellView.py

@@ -11,9 +11,8 @@
     NSCompositeSourceOver, NSCompositePlusDarker, NSRectFillUsingOperation, NSAlternateKeyMask, NSEndFunctionKey
 
 from math import ceil, floor
-from fontTools.misc.py23 import unichr
 import vanilla
-from vanilla.py23 import python_method
+from objc import python_method
 from defconAppKit.tools.iconCountBadge import addCountBadgeToIcon
 from defconAppKit.windows.popUpWindow import InformationPopUpWindow, HUDTextBox, HUDHorizontalLine
 
@@ -864,7 +863,7 @@ def keyDown_(self, event):
             NSBackspaceCharacter,
             NSDeleteFunctionKey,
             NSDeleteCharacter,
-            unichr(0x007F),
+            chr(0x007F),
         ]
         arrowCharacters = [
             NSUpArrowFunctionKey,
@@ -877,7 +876,7 @@ def keyDown_(self, event):
         nonCharacters = [
             NSPageUpFunctionKey,
             NSPageDownFunctionKey,
-            unichr(0x0003),
+            chr(0x0003),
             u"\033",  # esc
             u"\r",
             u"\t",

Lib/defconAppKit/controls/glyphLineView.py

@@ -2,7 +2,7 @@
 from AppKit import NSView, NSGraphicsContext, NSColor, NSAffineTransform, NSMenu, NSPoint, NSRectFill, \
     NSRectFillUsingOperation, NSPointInRect, NSCompositeSourceOver, NSMenuItem
 import vanilla
-from vanilla.py23 import python_method
+from objc import python_method
 from defconAppKit.controls.placardScrollView import PlacardScrollView, PlacardPopUpButton, DefconAppKitPlacardNSScrollView
 from defconAppKit.tools import drawing
 

Lib/defconAppKit/controls/glyphView.py

@@ -1,6 +1,6 @@
 from AppKit import NSView, NSMenuItem, NSAffineTransform, NSRectFill, NSColor
 import vanilla
-from vanilla.py23 import python_method
+from objc import python_method
 from defconAppKit.controls.placardScrollView import PlacardScrollView, PlacardPopUpButton
 from defconAppKit.tools import drawing
 

Lib/defconAppKit/representationFactories/glyphViewFactories.py

@@ -2,7 +2,7 @@
 from fontTools.pens.basePen import BasePen
 from fontTools.pens.transformPen import TransformPen
 from fontTools.pens.cocoaPen import CocoaPen
-from ufoLib.pointPen import AbstractPointPen
+from fontTools.ufoLib.pointPen import AbstractPointPen
 from AppKit import NSImage, NSGraphicsContext, NSData, NSCompositeSourceOver
 from Quartz import CIColor, CIImage, CIFilter
 

Lib/defconAppKit/tools/textSplitter.py

@@ -1,6 +1,3 @@
-from fontTools.misc.py23 import *
-
-
 def characterToGlyphName(c, cmap):
     try:
         c = unicode(c)

Lib/defconAppKit/windows/popUpWindow.py

@@ -1,7 +1,7 @@
 import time
 from AppKit import NSColor, NSView, NSBorderlessWindowMask, NSTornOffMenuWindowLevel, NSInsetRect, NSPanel, NSRectFill
 import vanilla
-from vanilla.py23 import python_method
+from objc import python_method
 from defconAppKit.tools.roundedRectBezierPath import roundedRectBezierPath