Peter M. Groen / oletools

Commit 754ae5d9d5a1ebfaf624d3f82c6040d851e840fd

Authored by Christian Herdtweck
1 parent 55b75d0c

fix issues found by pylint: non-existing or unused variables and imports; whitespace

Inline Side-by-side
Showing 1 changed file with 12 additions and 12 deletions
oletools/ppt_parser.py
  View file @754ae5d
... ... @@ -35,7 +35,6 @@ import logging
35 35 import struct
36 36 import traceback
37 37 import os
38   -import cStringIO
39 38  
40 39 import thirdparty.olefile as olefile
41 40 import zlib
... ... @@ -336,19 +335,19 @@ class CurrentUserAtom(PptType):
336 335 errs = self.check_rec_head()
337 336 errs.extend(self.check_value('size', self.size, self.SIZE))
338 337 errs.extend(self.check_value('headerToken', self.header_token,
339   - [clz.HEADER_TOKEN_ENCRYPT,
340   - clz.HEADER_TOKEN_NOCRYPT]))
  338 + [self.HEADER_TOKEN_ENCRYPT,
  339 + self.HEADER_TOKEN_NOCRYPT]))
341 340 errs.extend(self.check_range('lenUserName', self.len_user_name, None,
342 341 256))
343 342 errs.extend(self.check_value('docFileVersion', self.doc_file_version,
344   - clz.DOC_FILE_VERSION))
  343 + self.DOC_FILE_VERSION))
345 344 errs.extend(self.check_value('majorVersion', self.major_version,
346   - clz.MAJOR_VERSION))
  345 + self.MAJOR_VERSION))
347 346 errs.extend(self.check_value('minorVersion', self.minor_version,
348   - clz.MINOR_VERSION))
  347 + self.MINOR_VERSION))
349 348 errs.extend(self.check_value('relVersion', self.rel_version,
350   - [clz.REL_VERSION_CAN_USE,
351   - clz.REL_VERSION_NO_USE]))
  349 + [self.REL_VERSION_CAN_USE,
  350 + self.REL_VERSION_NO_USE]))
352 351 return errs
353 352  
354 353  
... ... @@ -643,7 +642,8 @@ class DocInfoListSubContainerOrAtom(PptType):
643 642  
644 643 def check_validity(self):
645 644 """ can be any of multiple types """
646   - self.check_value(self.rec_head.rec_type, self.VALID_RECORD_TYPES)
  645 + self.check_value('rh.recType', self.rec_head.rec_type,
  646 + self.VALID_RECORD_TYPES)
647 647  
648 648  
649 649 class DocInfoListContainer(PptType):
... ... @@ -657,6 +657,7 @@ class DocInfoListContainer(PptType):
657 657  
658 658 def __init__(self):
659 659 super(DocInfoListContainer, self).__init__()
  660 + self.rg_child_rec = None
660 661  
661 662 @classmethod
662 663 def extract_from(clz, stream):
... ... @@ -674,7 +675,6 @@ class DocInfoListContainer(PptType):
674 675 end_pos = curr_pos + obj.rec_head.rec_len
675 676 log.debug('start reading at pos {}, will read until {}'
676 677 .format(curr_pos, end_pos))
677   - bytes_read = 0
678 678 obj.rg_child_rec = []
679 679  
680 680 while curr_pos < end_pos:
... ... @@ -1376,8 +1376,8 @@ class PptParser(object):
1376 1376 log.debug('container is ok')
1377 1377 atom = container.vba_info_atom
1378 1378 log.debug('persist id ref is {}, has_macros {}, version {}'
1379   - .format(atom.persist_id_ref, atom.f_has_macros,
1380   - atom.version))
  1379 + .format(atom.persist_id_ref, atom.f_has_macros,
  1380 + atom.version))
1381 1381 containers.append(container)
1382 1382 for err in errs:
1383 1383 log.warning('check_validity(VBAInfoContainer): {}'
... ...