author | Stefan Teleman <stefan.teleman@oracle.com> |
Wed, 24 Sep 2014 14:44:19 -0700 | |
branch | s11u2-sru-backport |
changeset 3333 | 4af2ab639479 |
parent 3002 | baadf45ecbdd |
permissions | -rw-r--r-- |
3002
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Patch from upstream, not yet available in latest stable release-- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
http://www.logilab.org/revision/207574 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
--to fix CVE-2014-1838. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
|
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
diff -rupN logilab-common-0.58.2-orig/ChangeLog logilab-common-0.58.2/ChangeLog |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
--- logilab-common-0.58.2-orig/ChangeLog 2012-07-30 06:06:59.000000000 -0700 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
+++ logilab-common-0.58.2/ChangeLog 2014-03-14 10:34:00.085719000 -0700 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
@@ -1,6 +1,10 @@ |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
ChangeLog for logilab.common |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
============================ |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
|
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
+2014-02-03 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
+ * pdf_ext: removed, it had no known users (CVE-2014-1838) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
+ |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
+ |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
2012-07-30 -- 0.58.2 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
* modutils: fixes (closes #100757 and #100935) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
|
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
diff -rupN logilab-common-0.58.2-orig/pdf_ext.py logilab-common-0.58.2/pdf_ext.py |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
--- logilab-common-0.58.2-orig/pdf_ext.py 2012-07-30 06:06:59.000000000 -0700 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
+++ logilab-common-0.58.2/pdf_ext.py 1969-12-31 16:00:00.000000000 -0800 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
@@ -1,111 +0,0 @@ |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
-# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
-# contact http://www.logilab.fr/ -- mailto:[email protected] |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
25 |
-# |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
26 |
-# This file is part of logilab-common. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
27 |
-# |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
28 |
-# logilab-common is free software: you can redistribute it and/or modify it under |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
29 |
-# the terms of the GNU Lesser General Public License as published by the Free |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
30 |
-# Software Foundation, either version 2.1 of the License, or (at your option) any |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
31 |
-# later version. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
32 |
-# |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
33 |
-# logilab-common is distributed in the hope that it will be useful, but WITHOUT |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
34 |
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
35 |
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
36 |
-# details. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
37 |
-# |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
38 |
-# You should have received a copy of the GNU Lesser General Public License along |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
39 |
-# with logilab-common. If not, see <http://www.gnu.org/licenses/>. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
40 |
-"""Manipulate pdf and fdf files (pdftk recommended). |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
41 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
42 |
-Notes regarding pdftk, pdf forms and fdf files (form definition file) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
43 |
-fields names can be extracted with: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
44 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
45 |
- pdftk orig.pdf generate_fdf output truc.fdf |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
46 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
47 |
-to merge fdf and pdf: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
48 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
49 |
- pdftk orig.pdf fill_form test.fdf output result.pdf [flatten] |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
50 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
51 |
-without flatten, one could further edit the resulting form. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
52 |
-with flatten, everything is turned into text. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
53 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
54 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
55 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
56 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
57 |
-""" |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
58 |
-__docformat__ = "restructuredtext en" |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
59 |
-# XXX seems very unix specific |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
60 |
-# TODO: check availability of pdftk at import |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
61 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
62 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
63 |
-import os |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
64 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
65 |
-HEAD="""%FDF-1.2 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
66 |
-%\xE2\xE3\xCF\xD3 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
67 |
-1 0 obj |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
68 |
-<< |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
69 |
-/FDF |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
70 |
-<< |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
71 |
-/Fields [ |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
72 |
-""" |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
73 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
74 |
-TAIL="""] |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
75 |
->> |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
76 |
->> |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
77 |
-endobj |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
78 |
-trailer |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
79 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
80 |
-<< |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
81 |
-/Root 1 0 R |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
82 |
->> |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
83 |
-%%EOF |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
84 |
-""" |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
85 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
86 |
-def output_field( f ): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
87 |
- return "\xfe\xff" + "".join( [ "\x00"+c for c in f ] ) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
88 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
89 |
-def extract_keys(lines): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
90 |
- keys = [] |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
91 |
- for line in lines: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
92 |
- if line.startswith('/V'): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
93 |
- pass #print 'value',line |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
94 |
- elif line.startswith('/T'): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
95 |
- key = line[7:-2] |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
96 |
- key = ''.join(key.split('\x00')) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
97 |
- keys.append( key ) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
98 |
- return keys |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
99 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
100 |
-def write_field(out, key, value): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
101 |
- out.write("<<\n") |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
102 |
- if value: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
103 |
- out.write("/V (%s)\n" %value) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
104 |
- else: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
105 |
- out.write("/V /\n") |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
106 |
- out.write("/T (%s)\n" % output_field(key) ) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
107 |
- out.write(">> \n") |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
108 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
109 |
-def write_fields(out, fields): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
110 |
- out.write(HEAD) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
111 |
- for (key, value, comment) in fields: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
112 |
- write_field(out, key, value) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
113 |
- write_field(out, key+"a", value) # pour copie-carbone sur autres pages |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
114 |
- out.write(TAIL) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
115 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
116 |
-def extract_keys_from_pdf(filename): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
117 |
- # what about using 'pdftk filename dump_data_fields' and parsing the output ? |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
118 |
- os.system('pdftk %s generate_fdf output /tmp/toto.fdf' % filename) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
119 |
- lines = file('/tmp/toto.fdf').readlines() |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
120 |
- return extract_keys(lines) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
121 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
122 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
123 |
-def fill_pdf(infile, outfile, fields): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
124 |
- write_fields(file('/tmp/toto.fdf', 'w'), fields) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
125 |
- os.system('pdftk %s fill_form /tmp/toto.fdf output %s flatten' % (infile, outfile)) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
126 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
127 |
-def testfill_pdf(infile, outfile): |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
128 |
- keys = extract_keys_from_pdf(infile) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
129 |
- fields = [] |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
130 |
- for key in keys: |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
131 |
- fields.append( (key, key, '') ) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
132 |
- fill_pdf(infile, outfile, fields) |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
133 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
134 |
diff -rupN logilab-common-0.58.2-orig/README logilab-common-0.58.2/README |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
135 |
--- logilab-common-0.58.2-orig/README 2012-07-30 06:06:59.000000000 -0700 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
136 |
+++ logilab-common-0.58.2/README 2014-03-14 10:26:18.058139000 -0700 |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
137 |
@@ -123,8 +123,6 @@ Modules extending some external modules |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
138 |
|
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
139 |
* `hg`, some Mercurial_ utility functions. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
140 |
|
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
141 |
-* `pdf_ext`, pdf and fdf file manipulations, with pdftk. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
142 |
- |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
143 |
* `pyro_ext`, some Pyro_ utility functions. |
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
144 |
|
baadf45ecbdd
18299226 problem in PYTHON-MOD/LOGILAB-COMMON
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
145 |
* `sphinx_ext`, Sphinx_ plugin defining a `autodocstring` directive. |