Peter M. Groen / oletools

Commit 02b42f8dcd8882866c5d0f360fc29f2c23cf59bb

Authored by Christian Herdtweck
Committed by Philippe Lagadec
1 parent 939572f9

msodde: minor changes (doc strings, pep8, pylint)

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
oletools/msodde.py
  View file @02b42f8
@@ -95,7 +95,7 @@ if not _parent_dir in sys.path: @@ -95,7 +95,7 @@ if not _parent_dir in sys.path:
95 sys.path.insert(0, _parent_dir) 95 sys.path.insert(0, _parent_dir)
96 96
97 from oletools.thirdparty import olefile 97 from oletools.thirdparty import olefile
98 -import oletools.ooxml as ooxml 98 +from oletools import ooxml
99 from oletools import xls_parser 99 from oletools import xls_parser
100 100
101 # === PYTHON 2+3 SUPPORT ====================================================== 101 # === PYTHON 2+3 SUPPORT ======================================================
@@ -519,7 +519,7 @@ def process_xls(filepath): @@ -519,7 +519,7 @@ def process_xls(filepath):
519 if record.support_link_type in ( 519 if record.support_link_type in (
520 xls_parser.XlsRecordSupBook.LINK_TYPE_OLE_DDE, 520 xls_parser.XlsRecordSupBook.LINK_TYPE_OLE_DDE,
521 xls_parser.XlsRecordSupBook.LINK_TYPE_EXTERNAL): 521 xls_parser.XlsRecordSupBook.LINK_TYPE_EXTERNAL):
522 - result.append(record.virt_path) 522 + result.append(record.virt_path.replace(u'\u0003', u' '))
523 return u'\n'.join(result) 523 return u'\n'.join(result)
524 524
525 525
@@ -720,7 +720,7 @@ def process_xlsx(filepath, filed_filter_mode=None): @@ -720,7 +720,7 @@ def process_xlsx(filepath, filed_filter_mode=None):
720 link_info.append(elem.attrib['ddeService']) 720 link_info.append(elem.attrib['ddeService'])
721 if 'ddeTopic' in elem.attrib: 721 if 'ddeTopic' in elem.attrib:
722 link_info.append(elem.attrib['ddeTopic']) 722 link_info.append(elem.attrib['ddeTopic'])
723 - dde_links.append(' '.join(link_info)) 723 + dde_links.append(u' '.join(link_info))
724 724
725 # binary parts, e.g. contained in .xlsb 725 # binary parts, e.g. contained in .xlsb
726 for subfile, content_type, handle in parser.iter_non_xml(): 726 for subfile, content_type, handle in parser.iter_non_xml():