Fix review issues

afdko/Tools/SharedData/FDKScripts/pdfdoc.py

@@ -17,13 +17,9 @@
 from __future__ import print_function, absolute_import
 
 import os
-import sys
 import string
+import sys
 import time
-import tempfile
-import cStringIO
-from types import *
-from math import sin, cos, pi, ceil
 
 from . import pdfutils
 from .pdfutils import LINEEND   # this constant needed in both
@@ -193,17 +189,6 @@ def SaveToFileObject(self, fileobj):
         self.writeTrailer(f)
         f.write('%%EOF')  # no lineend needed on this one!
 
-        # with the Mac, we need to tag the file in a special
-        #way so the system knows it is a PDF file.
-        #This supplied by Joe Strout
-        if os.name == 'mac':
-            import macfs
-            try:
-                macfs.FSSpec(filename).SetCreatorType('CARO','PDF ')
-            except:
-                pass
-
-
     def printPDF(self):
         "prints it to standard output.  Logs positions for doing trailer"
         print("%PDF-1.0")
@@ -552,7 +537,7 @@ def clear(self):
         self.drawables = []
 
     def setStream(self, data):
-        if type(data) is ListType:
+        if isinstance(data, list):
             data = string.join(data, LINEEND)
         self.stream.setStream(data)
 

afdko/Tools/SharedData/FDKScripts/pdfgen.py

@@ -60,8 +60,7 @@
 import time
 import tempfile
 import cStringIO
-from types import *
-from math import sin, cos, tan, pi, ceil
+from math import sin, cos, tan, pi
 
 from . import pdfdoc
 from . import pdfgeom
@@ -529,9 +528,9 @@ def setMiterLimit(self, limit):
 
     def setDash(self, array=[], phase=0):
         """Two notations.  pass two numbers, or an array and phase"""
-        if type(array) == IntType or type(array) == FloatType:
+        if isinstance(array, int) or isinstance(array, float):
             self._code.append('[%s %s] 0 d' % (array, phase))
-        elif type(array) == ListType or type(Array) == TupleType:
+        elif isinstance(array, list) or isinstance(array, tuple):
             assert phase <= len(array), "setDash phase must be l.t.e. length of array"
             textarray = string.join(map(str, array))
             self._code.append('[%s] %s d' % (textarray, phase))
@@ -578,11 +577,6 @@ def drawInlineImage(self, image, x,y, width=None,height=None):
         Also allow file names as well as images.  This allows a
         caching mechanism"""
         # print "drawInlineImage: x=%s, y=%s, width = %s, height=%s " % (x,y, width, height)
-        try:
-            import Image
-        except ImportError:
-            print('Python Imaging Library not available')
-            return
         try:
             import zlib
         except ImportError:
@@ -591,7 +585,7 @@ def drawInlineImage(self, image, x,y, width=None,height=None):
 
         self._currentPageHasImages = 1
 
-        if type(image) == StringType:
+        if isinstance(image, str):
             if os.path.splitext(image)[1] in ['.jpg', '.JPG']:
             #directly process JPEG files
             #open file, needs some error handling!!
@@ -1043,13 +1037,13 @@ def textLines(self, stuff, trim=1):
         since this may be indented, by default it trims whitespace
         off each line and from the beginning; set trim=0 to preserve
         whitespace."""
-        if type(stuff) == StringType:
+        if isinstance(stuff, str):
             lines = string.split(string.strip(stuff), '\n')
             if trim==1:
                 lines = map(string.strip,lines)
-        elif type(stuff) == ListType:
+        elif isinstance(stuff, list):
             lines = stuff
-        elif type(stuff) == TupleType:
+        elif isinstance(stuff, tuple):
             lines = stuff
         else:
             assert 1==0, "argument to textlines must be string,, list or tuple"