From bce382656f3d4e1704057fa063fbeae9cbd58c14 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Thu, 11 Jan 2018 11:40:44 +0100 Subject: [PATCH] msodde: make py3-compatible --- oletools/msodde.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/oletools/msodde.py b/oletools/msodde.py index 397228a..2fe19d0 100644 --- a/oletools/msodde.py +++ b/oletools/msodde.py @@ -120,13 +120,13 @@ NS_WORD = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main' NS_WORD_2003 = 'http://schemas.microsoft.com/office/word/2003/wordml' NO_QUOTES = False # XML tag for 'w:instrText' -TAG_W_INSTRTEXT = ['{%s}instrText' % ns for ns in NS_WORD, NS_WORD_2003] -TAG_W_FLDSIMPLE = ['{%s}fldSimple' % ns for ns in NS_WORD, NS_WORD_2003] -TAG_W_FLDCHAR = ['{%s}fldChar' % ns for ns in NS_WORD, NS_WORD_2003] -TAG_W_P = ["{%s}p" % ns for ns in NS_WORD, NS_WORD_2003] -TAG_W_R = ["{%s}r" % ns for ns in NS_WORD, NS_WORD_2003] -ATTR_W_INSTR = ['{%s}instr' % ns for ns in NS_WORD, NS_WORD_2003] -ATTR_W_FLDCHARTYPE = ['{%s}fldCharType' % ns for ns in NS_WORD, NS_WORD_2003] +TAG_W_INSTRTEXT = ['{%s}instrText' % ns for ns in (NS_WORD, NS_WORD_2003)] +TAG_W_FLDSIMPLE = ['{%s}fldSimple' % ns for ns in (NS_WORD, NS_WORD_2003)] +TAG_W_FLDCHAR = ['{%s}fldChar' % ns for ns in (NS_WORD, NS_WORD_2003)] +TAG_W_P = ["{%s}p" % ns for ns in (NS_WORD, NS_WORD_2003)] +TAG_W_R = ["{%s}r" % ns for ns in (NS_WORD, NS_WORD_2003)] +ATTR_W_INSTR = ['{%s}instr' % ns for ns in (NS_WORD, NS_WORD_2003)] +ATTR_W_FLDCHARTYPE = ['{%s}fldCharType' % ns for ns in (NS_WORD, NS_WORD_2003)] LOCATIONS = ('word/document.xml', 'word/endnotes.xml', 'word/footnotes.xml', 'word/header1.xml', 'word/footer1.xml', 'word/header2.xml', 'word/footer2.xml', 'word/comments.xml') -- libgit2 0.21.4