diff options
| author | jvoisin | 2011-07-26 21:12:58 +0200 |
|---|---|---|
| committer | jvoisin | 2011-07-26 21:12:58 +0200 |
| commit | c3ce1dd99ec1671d50a7cf89dc1b287fbbdf96aa (patch) | |
| tree | 0d3a39a19938d6ddcc84c2a6b77937340b020afa /lib/office.py | |
| parent | 446cb258ce93a73e62c1a19779c9d67e0457412f (diff) | |
Simplification of the __init__() method
Diffstat (limited to 'lib/office.py')
| -rw-r--r-- | lib/office.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/office.py b/lib/office.py index 5fa475d..00fce3c 100644 --- a/lib/office.py +++ b/lib/office.py | |||
| @@ -89,8 +89,8 @@ class OpenDocumentStripper(archive.GenericArchiveStripper): | |||
| 89 | return False | 89 | return False |
| 90 | except KeyError: # no meta.xml in the file | 90 | except KeyError: # no meta.xml in the file |
| 91 | zipin.close() | 91 | zipin.close() |
| 92 | czf = archive.ZipStripper(self.realname, self.filename, | 92 | czf = archive.ZipStripper(self.filename, self.parser, |
| 93 | self.parser, self.editor, self.backup, self.add2archive) | 93 | 'application/zip', self.backup, self.add2archive) |
| 94 | if czf.is_clean(): | 94 | if czf.is_clean(): |
| 95 | return True | 95 | return True |
| 96 | else: | 96 | else: |
| @@ -102,14 +102,14 @@ class PdfStripper(parser.GenericParser): | |||
| 102 | ''' | 102 | ''' |
| 103 | Represent a pdf file, with the help of pdfrw | 103 | Represent a pdf file, with the help of pdfrw |
| 104 | ''' | 104 | ''' |
| 105 | def __init__(self, filename, realname, backup): | 105 | def __init__(self, filename, parser, mime, backup, add2archive): |
| 106 | name, ext = os.path.splitext(filename) | 106 | name, ext = os.path.splitext(filename) |
| 107 | self.output = name + '.cleaned' + ext | 107 | self.output = name + '.cleaned' + ext |
| 108 | self.filename = filename | 108 | self.filename = filename |
| 109 | self.backup = backup | 109 | self.backup = backup |
| 110 | self.realname = realname | 110 | self.realname = realname |
| 111 | self.shortname = os.path.basename(filename) | 111 | self.shortname = os.path.basename(filename) |
| 112 | self.mime = mimetypes.guess_type(filename)[0] | 112 | self.mime = mime |
| 113 | self.tempdir = tempfile.mkdtemp() | 113 | self.tempdir = tempfile.mkdtemp() |
| 114 | self.trailer = pdfrw.PdfReader(self.filename) | 114 | self.trailer = pdfrw.PdfReader(self.filename) |
| 115 | self.writer = pdfrw.PdfWriter() | 115 | self.writer = pdfrw.PdfWriter() |
