1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
diff --unified --recursive --text --color jbig2enc-0.29/pdf.py jbig2enc-0.29.new/pdf.py
--- jbig2enc-0.29/pdf.py 2017-01-30 12:27:36.000000000 -0500
+++ jbig2enc-0.29.new/pdf.py 2022-02-18 21:55:20.043706067 -0500
@@ -33,23 +33,24 @@
class Ref:
def __init__(self, x):
self.x = x
- def __str__(self):
- return "%d 0 R" % self.x
+
+ def __bytes__(self):
+ return b"%d 0 R" % self.x
class Dict:
def __init__(self, values = {}):
self.d = {}
self.d.update(values)
- def __str__(self):
- s = ['<< ']
+ def __bytes__(self):
+ s = [b'<< ']
for (x, y) in self.d.items():
- s.append('/%s ' % x)
- s.append(str(y))
- s.append("\n")
- s.append(">>\n")
+ s.append(b"/%s " % x.encode())
+ s.append(y.encode())
+ s.append(b"\n")
+ s.append(b">>\n")
- return ''.join(s)
+ return b''.join(s)
global_next_id = 1
@@ -65,16 +66,18 @@
self.id = global_next_id
global_next_id += 1
- def __str__(self):
+ def __bytes__(self):
s = []
- s.append(str(self.d))
+ s.append(bytes(self.d))
if self.stream is not None:
- s.append('stream\n')
- s.append(self.stream)
- s.append('\nendstream\n')
- s.append('endobj\n')
-
- return ''.join(s)
+ s.append(b'stream\n')
+ if isinstance(self.stream, str):
+ s.append(self.stream.encode())
+ else:
+ s.append(self.stream)
+ s.append(b'\nendstream\n')
+ s.append(b'endobj\n')
+ return b''.join(s)
class Doc:
def __init__(self):
@@ -89,7 +92,7 @@
self.pages.append(o)
return self.add_object(o)
- def __str__(self):
+ def __bytes__(self):
a = []
j = [0]
offsets = []
@@ -97,27 +100,27 @@
def add(x):
a.append(x)
j[0] += len(x) + 1
- add('%PDF-1.4')
+ add(b'%PDF-1.4')
for o in self.objs:
offsets.append(j[0])
- add('%d 0 obj' % o.id)
- add(str(o))
+ add(b'%d 0 obj' % o.id)
+ add(bytes(o))
xrefstart = j[0]
- a.append('xref')
- a.append('0 %d' % (len(offsets) + 1))
- a.append('0000000000 65535 f ')
+ a.append(b'xref')
+ a.append(b'0 %d' % (len(offsets) + 1))
+ a.append(b'0000000000 65535 f ')
for o in offsets:
- a.append('%010d 00000 n ' % o)
- a.append('')
- a.append('trailer')
- a.append('<< /Size %d\n/Root 1 0 R >>' % (len(offsets) + 1))
- a.append('startxref')
- a.append(str(xrefstart))
- a.append('%%EOF')
+ a.append(b'%010d 00000 n ' % o)
+ a.append(b'')
+ a.append(b'trailer')
+ a.append(b'<< /Size %d\n/Root 1 0 R >>' % (len(offsets) + 1))
+ a.append(b'startxref')
+ a.append(b'%d' % xrefstart)
+ a.append(b'%%EOF')
# sys.stderr.write(str(offsets) + "\n")
- return '\n'.join(a)
+ return b'\n'.join(a)
def ref(x):
return '%d 0 R' % x
@@ -128,13 +131,15 @@
doc.add_object(Obj({'Type' : '/Outlines', 'Count': '0'}))
pages = Obj({'Type' : '/Pages'})
doc.add_object(pages)
- symd = doc.add_object(Obj({}, file(symboltable, 'rb').read()))
+ with open(symboltable, 'rb') as f:
+ symd = doc.add_object(Obj({}, f.read()))
page_objs = []
pagefiles.sort()
for p in pagefiles:
try:
- contents = file(p, mode='rb').read()
+ with open(p, 'rb') as f:
+ contents = f.read()
except IOError:
sys.stderr.write("error reading page file %s\n"% p)
continue
@@ -162,7 +167,8 @@
pages.d.d['Count'] = str(len(page_objs))
pages.d.d['Kids'] = '[' + ' '.join([ref(x.id) for x in page_objs]) + ']'
- print str(doc)
+ sys.stdout.buffer.write(bytes(doc))
+ sys.stdout.buffer.write(b'\n')
def usage(script, msg):
|