Merge pull request #815 from alonisser/master

Fix missing string casting - quick fix for crashing syncdata

simple/government_bills/pdftools.py

@@ -4,24 +4,25 @@
 import sys
 from textutil import asblocks, sanitize
 from django.utils.functional import SimpleLazyObject
+
 if os.name == 'posix' and sys.version_info[0] < 3:
     import subprocess32 as subprocess
 else:
-    import subprocess
+    import subprocess2
 
-DEBUG=False
+DEBUG = False
 
 
-class PdfToolnameNotFoundException(object):
+class PdfToolnameNotFoundException(Exception):
     pass
 
 
 def get_path_for_tool_by_toolname(toolname):
     default_path = os.path.dirname(sys.modules[__name__].__file__)
     path_options = [
-                os.path.join(default_path, '..', '..', '..', '..', '..', '..', 'parts', 'poppler', 'bin'),
-                os.path.join(default_path)
-                    ]
+        os.path.join(default_path, '..', '..', '..', '..', '..', '..', 'parts', 'poppler', 'bin'),
+        os.path.join(default_path)
+    ]
     path_prefix_candidate_list = path_options + os.environ['PATH'].split(":")
 
     for path_prefix_option in path_prefix_candidate_list:
@@ -32,47 +33,57 @@ def get_path_for_tool_by_toolname(toolname):
         raise PdfToolnameNotFoundException(
             toolname + " not found. Check your PATH environment variable and installation of poppler")
 
-PDFTOTEXT=SimpleLazyObject(lambda: get_path_for_tool_by_toolname('pdftotext'))
-PDFINFO=SimpleLazyObject(lambda: get_path_for_tool_by_toolname('pdfinfo'))
+
+PDFTOTEXT = SimpleLazyObject(lambda: get_path_for_tool_by_toolname('pdftotext'))
+PDFINFO = SimpleLazyObject(lambda: get_path_for_tool_by_toolname('pdfinfo'))
+
 
 def pdftotext_version():
     if not PDFTOTEXT:
         return ('0', '0', '0')
-    p = subprocess.Popen(executable=str(PDFTOTEXT), args=[str(PDFTOTEXT), '-v'], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-    major, minor, patchlevel = map(lambda x,y:y if x is None else x,p.stderr.readlines()[0].strip().split()[-1].split('.'),[0]*3)
+    p = subprocess.Popen(executable=str(PDFTOTEXT), args=[str(PDFTOTEXT), '-v'], stderr=subprocess.PIPE,
+                         stdout=subprocess.PIPE)
+    major, minor, patchlevel = map(lambda x, y: y if x is None else x,
+                                   p.stderr.readlines()[0].strip().split()[-1].split('.'), [0] * 3)
     p.kill()
     return major, minor, patchlevel
 
+
 PDFTOTEXT_VERSION = SimpleLazyObject(lambda: pdftotext_version())
 
 if DEBUG:
     print "pdftotext from %s, version %s" % (PDFTOTEXT, str(PDFTOTEXT_VERSION))
-    print "pdfinfo from %s" % PDFINFO
+    print "pdfinfo from %s" % str(PDFINFO)
+
 
 def pdftotext_version_pass():
-    major,minor,patch_level = PDFTOTEXT_VERSION
-    major,minor = int(major),int(minor)
+    major, minor, patch_level = PDFTOTEXT_VERSION
+    major, minor = int(major), int(minor)
     return (major >= 1) or ((major == 0) and (minor >= 14))
 
+
 def capture_output(args):
     return subprocess.Popen(args, stdout=subprocess.PIPE).stdout.readlines()
 
+
 def pdftotext(filename, first=None, last=None, x=0, y=0, w=0, h=0):
     params = []
     if first is not None:
         params.extend(['-f %s' % first])
     if last is not None:
         params.extend(['-l %s' % last])
     args = ("%s %s -x %d -y %d -W %d -H %d %s -" % (PDFTOTEXT,
-            ' '.join(params), x, y, w, h, filename)).split()
+                                                    ' '.join(params), x, y, w, h, filename)).split()
     output = capture_output(args)
-    return sanitize([unicode(l,'utf8') for l in output])
+    return sanitize([unicode(l, 'utf8') for l in output])
+
 
 def camel_to_lower_case(s):
-    t = ''.join('_' if c == ' ' else ('_'+c.lower() if c in uppercase else c) for c in s)
+    t = ''.join('_' if c == ' ' else ('_' + c.lower() if c in uppercase else c) for c in s)
     if t[0] == '_': return t[1:]
     return t
 
+
 def pdfinfo(filename):
     """ Example output of pdfinfo:
 Creator:        Adobe InDesign CS2 (4.0.2)
@@ -87,36 +98,43 @@ def pdfinfo(filename):
 Optimized:      yes
 PDF version:    1.4
     """
+
     class PdfInfo(object):
         def __str__(self):
             return 'PdfInfo: %s: %s, %s, %s' % (
                 self.filename, self.pages, self.file_size, self.mod_date)
+
         __repr__ = __str__
+
     pdfinfo = PdfInfo()
     pdfinfo.filename = filename
     numbers = set('pages file_size'.split())
+
     def convert(k, v):
         if k in numbers: return int(v.split()[0])
         return v
+
     data = [(k, convert(k, v.strip())) for k, v in
-            ((camel_to_lower_case(k), v.strip()) for k,v in
-            (l.split(':',1) for l in capture_output([PDFINFO, filename])))]
+            ((camel_to_lower_case(k), v.strip()) for k, v in
+             (l.split(':', 1) for l in capture_output([str(PDFINFO), filename])))]
     pdfinfo.__dict__.update(data)
     return pdfinfo
 
+
 def isempty(filename, x=0, y=0, W=0, H=0):
     return len(asblocks(filename, x, y, W, H)) == 0
 
+
 def num_blocks(filename, x=0, y=0, W=0, H=0):
-    return len(asblocks(filename, x=x,y=y,W=W,H=H))
+    return len(asblocks(filename, x=x, y=y, W=W, H=H))
+
 
 if __name__ == '__main__':
     # Test code - not used
     filename = '538.pdf'
     fulltext = asblocks(filename)
-    texts = [pdftotext(filename, x=x,W=1000) for x in xrange(100)]
+    texts = [pdftotext(filename, x=x, W=1000) for x in xrange(100)]
     checksums = [checksum(filename, x=x, W=1000) for x in xrange(100)]
-    for i in xrange(len(checksums)-1):
-        if checksums[i] != checksums[i+1]:
+    for i in xrange(len(checksums) - 1):
+        if checksums[i] != checksums[i + 1]:
             print "change at %s" % i
-