Commit bce382656f3d4e1704057fa063fbeae9cbd58c14

Authored by Christian Herdtweck
1 parent f0fe1d4e

msodde: make py3-compatible

Showing 1 changed file with 7 additions and 7 deletions
oletools/msodde.py
@@ -120,13 +120,13 @@ NS_WORD = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main' @@ -120,13 +120,13 @@ NS_WORD = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main'
120 NS_WORD_2003 = 'http://schemas.microsoft.com/office/word/2003/wordml' 120 NS_WORD_2003 = 'http://schemas.microsoft.com/office/word/2003/wordml'
121 NO_QUOTES = False 121 NO_QUOTES = False
122 # XML tag for 'w:instrText' 122 # XML tag for 'w:instrText'
123 -TAG_W_INSTRTEXT = ['{%s}instrText' % ns for ns in NS_WORD, NS_WORD_2003]  
124 -TAG_W_FLDSIMPLE = ['{%s}fldSimple' % ns for ns in NS_WORD, NS_WORD_2003]  
125 -TAG_W_FLDCHAR = ['{%s}fldChar' % ns for ns in NS_WORD, NS_WORD_2003]  
126 -TAG_W_P = ["{%s}p" % ns for ns in NS_WORD, NS_WORD_2003]  
127 -TAG_W_R = ["{%s}r" % ns for ns in NS_WORD, NS_WORD_2003]  
128 -ATTR_W_INSTR = ['{%s}instr' % ns for ns in NS_WORD, NS_WORD_2003]  
129 -ATTR_W_FLDCHARTYPE = ['{%s}fldCharType' % ns for ns in NS_WORD, NS_WORD_2003] 123 +TAG_W_INSTRTEXT = ['{%s}instrText' % ns for ns in (NS_WORD, NS_WORD_2003)]
  124 +TAG_W_FLDSIMPLE = ['{%s}fldSimple' % ns for ns in (NS_WORD, NS_WORD_2003)]
  125 +TAG_W_FLDCHAR = ['{%s}fldChar' % ns for ns in (NS_WORD, NS_WORD_2003)]
  126 +TAG_W_P = ["{%s}p" % ns for ns in (NS_WORD, NS_WORD_2003)]
  127 +TAG_W_R = ["{%s}r" % ns for ns in (NS_WORD, NS_WORD_2003)]
  128 +ATTR_W_INSTR = ['{%s}instr' % ns for ns in (NS_WORD, NS_WORD_2003)]
  129 +ATTR_W_FLDCHARTYPE = ['{%s}fldCharType' % ns for ns in (NS_WORD, NS_WORD_2003)]
130 LOCATIONS = ('word/document.xml', 'word/endnotes.xml', 'word/footnotes.xml', 130 LOCATIONS = ('word/document.xml', 'word/endnotes.xml', 'word/footnotes.xml',
131 'word/header1.xml', 'word/footer1.xml', 'word/header2.xml', 131 'word/header1.xml', 'word/footer1.xml', 'word/header2.xml',
132 'word/footer2.xml', 'word/comments.xml') 132 'word/footer2.xml', 'word/comments.xml')