diff --git a/pdfminer/ascii85.py b/pdfminer/ascii85.py index 7fda67b..a9f501d 100644 --- a/pdfminer/ascii85.py +++ b/pdfminer/ascii85.py @@ -35,7 +35,7 @@ def ascii85decode(data): out += struct.pack('>L', b) n = b = 0 elif c == b'z': - assert n == 0 + assert n == 0, str(n) out += b'\0\0\0\0' elif c == b'~': if n: @@ -63,11 +63,11 @@ def asciihexdecode(data): def decode(x): i=int(x,16) return six.int2byte(i) - - out=b'' + + out=b'' for x in hex_re.findall(data): out+=decode(x) - + m = trail_re.search(data) if m: out+=decode(m.group(1)+b'0') diff --git a/pdfminer/cmapdb.py b/pdfminer/cmapdb.py index f48fcf8..19dddf3 100644 --- a/pdfminer/cmapdb.py +++ b/pdfminer/cmapdb.py @@ -80,7 +80,7 @@ class CMap(CMapBase): return '' % self.attrs.get('CMapName') def use_cmap(self, cmap): - assert isinstance(cmap, CMap) + assert isinstance(cmap, CMap), str(type(cmap)) def copy(dst, src): for (k, v) in src.iteritems(): @@ -158,7 +158,7 @@ class UnicodeMap(CMapBase): class FileCMap(CMap): def add_code2cid(self, code, cid): - assert isinstance(code, str) and isinstance(cid, int) + assert isinstance(code, str) and isinstance(cid, int), str((type(code), type(cid))) d = self.code2cid for c in code[:-1]: c = ord(c) @@ -178,7 +178,7 @@ class FileCMap(CMap): class FileUnicodeMap(UnicodeMap): def add_cid2unichr(self, cid, code): - assert isinstance(cid, int) + assert isinstance(cid, int), str(type(cid)) if isinstance(code, PSLiteral): # Interpret as an Adobe glyph name. self.cid2unichr[cid] = name2unicode(code.name) @@ -304,7 +304,7 @@ class CMapParser(PSStackParser): KEYWORD_ENDBFCHAR = KWD(b'endbfchar') KEYWORD_BEGINNOTDEFRANGE = KWD(b'beginnotdefrange') KEYWORD_ENDNOTDEFRANGE = KWD(b'endnotdefrange') - + def do_keyword(self, pos, token): if token is self.KEYWORD_BEGINCMAP: self._in_cmap = True @@ -359,7 +359,7 @@ class CMapParser(PSStackParser): s1 = nunpack(svar) e1 = nunpack(evar) vlen = len(svar) - #assert s1 <= e1 + #assert s1 <= e1, str((s1, e1)) for i in range(e1-s1+1): x = sprefix+struct.pack('>L', s1+i)[-vlen:] self.cmap.add_code2cid(x, cid+i) @@ -386,7 +386,7 @@ class CMapParser(PSStackParser): continue s1 = nunpack(s) e1 = nunpack(e) - #assert s1 <= e1 + #assert s1 <= e1, str((s1, e1)) if isinstance(code, list): for i in range(e1-s1+1): self.cmap.add_cid2unichr(s1+i, code[i]) diff --git a/pdfminer/converter.py b/pdfminer/converter.py index baf78b7..2913ede 100644 --- a/pdfminer/converter.py +++ b/pdfminer/converter.py @@ -48,8 +48,8 @@ class PDFLayoutAnalyzer(PDFTextDevice): return def end_page(self, page): - assert not self._stack - assert isinstance(self.cur_item, LTPage) + assert not self._stack, str(len(stack)) + assert isinstance(self.cur_item, LTPage), str(type(self.cur_item)) if self.laparams is not None: self.cur_item.analyze(self.laparams) self.pageno += 1 @@ -63,13 +63,13 @@ class PDFLayoutAnalyzer(PDFTextDevice): def end_figure(self, _): fig = self.cur_item - assert isinstance(self.cur_item, LTFigure) + assert isinstance(self.cur_item, LTFigure), str(type(self.cur_item)) self.cur_item = self._stack.pop() self.cur_item.add(fig) return def render_image(self, name, stream): - assert isinstance(self.cur_item, LTFigure) + assert isinstance(self.cur_item, LTFigure), str(type(self.cur_item)) item = LTImage(name, stream, (self.cur_item.x0, self.cur_item.y0, self.cur_item.x1, self.cur_item.y1)) @@ -115,7 +115,7 @@ class PDFLayoutAnalyzer(PDFTextDevice): def render_char(self, matrix, font, fontsize, scaling, rise, cid): try: text = font.to_unichr(cid) - assert isinstance(text, six.text_type), text + assert isinstance(text, six.text_type), str(type(text)) except PDFUnicodeNotDefined: text = self.handle_undefined_char(font, cid) textwidth = font.char_width(cid) @@ -535,7 +535,7 @@ class XMLConverter(PDFConverter): self.write('\n' % (item.width, item.height)) else: - assert 0, item + assert False, str(('Unhandled', item)) return render(ltpage) return diff --git a/pdfminer/image.py b/pdfminer/image.py index b6b8bab..e85815c 100644 --- a/pdfminer/image.py +++ b/pdfminer/image.py @@ -34,9 +34,9 @@ class BMPWriter(object): self.datasize = self.linesize * self.height headersize = 14+40+ncols*4 info = struct.pack('