From af1c9968b2edc827ee9115355a72b3c56c4fbe61 Mon Sep 17 00:00:00 2001 From: Denis Jacquerye Date: Fri, 29 Nov 2013 21:51:15 +0100 Subject: [PATCH] from __future__ imports must be first for python 3.3.2 adding \ to break lines in fontTools/misc/transorm.py unneeded closing parenthesis in T_S_I__1.py --- Lib/fontTools/misc/transform.py | 10 +++++----- Lib/fontTools/t1Lib.py | 9 ++++----- Lib/fontTools/ttLib/tables/S_V_G_.py | 22 +++++++++++----------- Lib/fontTools/ttLib/tables/T_S_I__1.py | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Lib/fontTools/misc/transform.py b/Lib/fontTools/misc/transform.py index a7e853917..531b2880f 100644 --- a/Lib/fontTools/misc/transform.py +++ b/Lib/fontTools/misc/transform.py @@ -289,8 +289,8 @@ class Transform(object): """ xx1, xy1, yx1, yy1, dx1, dy1 = self.__affine xx2, xy2, yx2, yy2, dx2, dy2 = other - return (xx1, xy1, yx1, yy1, dx1, dy1) < - (xx2, xy2, yx2, yy2, dx2, dy2)) + return (xx1, xy1, yx1, yy1, dx1, dy1) < \ + (xx2, xy2, yx2, yy2, dx2, dy2) def __eq__(self, other): """Transform instances are comparable: @@ -313,8 +313,8 @@ class Transform(object): """ xx1, xy1, yx1, yy1, dx1, dy1 = self.__affine xx2, xy2, yx2, yy2, dx2, dy2 = other - return (xx1, xy1, yx1, yy1, dx1, dy1) == - (xx2, xy2, yx2, yy2, dx2, dy2)) + return (xx1, xy1, yx1, yy1, dx1, dy1) == \ + (xx2, xy2, yx2, yy2, dx2, dy2) def __hash__(self): """Transform instances are hashable, meaning you can use them as @@ -343,7 +343,7 @@ class Transform(object): return hash(self.__affine) def __repr__(self): - return "<%s [%s %s %s %s %s %s]>" % ((self.__class__.__name__,) + return "<%s [%s %s %s %s %s %s]>" % ((self.__class__.__name__,) \ + tuple(map(str, self.__affine))) diff --git a/Lib/fontTools/t1Lib.py b/Lib/fontTools/t1Lib.py index 610c4be5e..1a81a997b 100644 --- a/Lib/fontTools/t1Lib.py +++ b/Lib/fontTools/t1Lib.py @@ -15,11 +15,6 @@ write(path, data, kind='OTHER', dohex=0) part should be written as hexadecimal or binary, but only if kind is 'LWFN' or 'PFB'. """ - -__author__ = "jvr" -__version__ = "1.0b2" -DEBUG = 0 - from __future__ import print_function, division from fontTools.misc.py23 import * from fontTools.misc import eexec @@ -27,6 +22,10 @@ from fontTools.misc.macCreatorType import getMacCreatorAndType import os import re +__author__ = "jvr" +__version__ = "1.0b2" +DEBUG = 0 + try: try: diff --git a/Lib/fontTools/ttLib/tables/S_V_G_.py b/Lib/fontTools/ttLib/tables/S_V_G_.py index c40768fa4..8d0481111 100644 --- a/Lib/fontTools/ttLib/tables/S_V_G_.py +++ b/Lib/fontTools/ttLib/tables/S_V_G_.py @@ -1,3 +1,14 @@ +from __future__ import print_function, division +from fontTools.misc.py23 import * +from fontTools.misc import sstruct +from . import DefaultTable +try: + import xml.etree.cElementTree as ET +except ImportError: + import xml.etree.ElementTree as ET +import struct +import re + __doc__=""" Compiles/decompiles version 0 and 1 SVG tables from/to XML. @@ -42,17 +53,6 @@ the number of elements. """ -from __future__ import print_function, division -from fontTools.misc.py23 import * -from fontTools.misc import sstruct -from . import DefaultTable -try: - import xml.etree.cElementTree as ET -except ImportError: - import xml.etree.ElementTree as ET -import struct -import re - XML = ET.XML XMLElement = ET.Element xmlToString = ET.tostring diff --git a/Lib/fontTools/ttLib/tables/T_S_I__1.py b/Lib/fontTools/ttLib/tables/T_S_I__1.py index 5182d4e5a..bcb404994 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__1.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__1.py @@ -91,7 +91,7 @@ class table_T_S_I__1(DefaultTable.DefaultTable): writer.endtag("glyphProgram") writer.newline() writer.newline() - extra_names = sorted(self.extraPrograms.keys())) + extra_names = sorted(self.extraPrograms.keys()) for name in extra_names: text = self.extraPrograms[name] if not text: