Commit 389d00056cba47a7a457bf5e9ba30d47ed04b3f3

Authored by Christian Herdtweck
Committed by Philippe Lagadec
1 parent 4257c836

msodde: rename process_openxml to process_docx

This is in preparation of adding new function process_xlsx
Showing 1 changed file with 5 additions and 5 deletions
oletools/msodde.py
@@ -489,12 +489,12 @@ def process_ole(filepath): @@ -489,12 +489,12 @@ def process_ole(filepath):
489 ole = olefile.OleFileIO(filepath, path_encoding=None) 489 ole = olefile.OleFileIO(filepath, path_encoding=None)
490 text_parts = process_ole_storage(ole) 490 text_parts = process_ole_storage(ole)
491 491
492 - # mimic behaviour of process_openxml: combine links to single text string 492 + # mimic behaviour of process_docx: combine links to single text string
493 return u'\n'.join(text_parts) 493 return u'\n'.join(text_parts)
494 494
495 495
496 -def process_openxml(filepath, field_filter_mode=None):  
497 - log.debug('process_openxml') 496 +def process_docx(filepath, field_filter_mode=None):
  497 + log.debug('process_docx')
498 all_fields = [] 498 all_fields = []
499 z = zipfile.ZipFile(filepath) 499 z = zipfile.ZipFile(filepath)
500 for filepath in z.namelist(): 500 for filepath in z.namelist():
@@ -678,11 +678,11 @@ def field_is_blacklisted(contents): @@ -678,11 +678,11 @@ def field_is_blacklisted(contents):
678 678
679 679
680 def process_file(filepath, field_filter_mode=None): 680 def process_file(filepath, field_filter_mode=None):
681 - """ decides to either call process_openxml or process_ole """ 681 + """ decides to either call process_docx or process_ole """
682 if olefile.isOleFile(filepath): 682 if olefile.isOleFile(filepath):
683 return process_ole(filepath) 683 return process_ole(filepath)
684 else: 684 else:
685 - return process_openxml(filepath, field_filter_mode) 685 + return process_docx(filepath, field_filter_mode)
686 686
687 687
688 #=== MAIN ================================================================= 688 #=== MAIN =================================================================