From e2d05a8e6b71d2b9382bc71cf24cbf84bdf8b049 Mon Sep 17 00:00:00 2001
From: decalage2 <decalage@laposte.net>
Date: Mon, 19 Feb 2018 13:00:52 +0100
Subject: [PATCH] oleform: fixed issue #260, removed long integer literals

---
 oletools/oleform.py |  9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/oletools/oleform.py b/oletools/oleform.py
index 7b0c3cd..245a102 100644
--- a/oletools/oleform.py
+++ b/oletools/oleform.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
+# CHANGELOG:
+# 2018-02-19 v0.53 PL: - fixed issue #260, removed long integer literals
+
 import struct
 
 class OleFormParsingError(Exception):
@@ -118,7 +121,7 @@ def consume_TextProps(stream):
 def consume_GuidAndFont(stream):
     # GuidAndFont: [MS-OFORMS] 2.4.7
     UUIDS = stream.unpacks('<LHH', 8) + stream.unpacks('>Q', 8)
-    if UUIDS == (199447043, 36753, 4558, 11376937813817407569L):
+    if UUIDS == (199447043, 36753, 4558, 11376937813817407569):
         # UUID == {0BE35203-8F91-11CE-9DE300AA004BB851}
         # StdFont: [MS-OFORMS] 2.4.12
         stream.check_value('StdFont (version)', '<B', 1, 1)
@@ -126,7 +129,7 @@ def consume_GuidAndFont(stream):
         stream.read(9)
         bFaceLen = stream.unpack('<B', 1)
         stream.read(bFaceLen)
-    elif UUIDS == (2948729120, 55886, 4558, 13349514450607572916L):
+    elif UUIDS == (2948729120, 55886, 4558, 13349514450607572916):
         # UUID == {AFC20920-DA4E-11CE-B94300AA006887B4}
         consume_TextProps(stream)
     else:
@@ -136,7 +139,7 @@ def consume_GuidAndPicture(stream):
     # GuidAndPicture: [MS-OFORMS] 2.4.8
     # UUID == {0BE35204-8F91-11CE-9DE3-00AA004BB851}
     stream.check_values('GuidAndPicture (UUID part 1)', '<LHH', 8, (199447044, 36753, 4558))
-    stream.check_value('GuidAndPicture (UUID part 1)', '>Q', 8, 11376937813817407569L)
+    stream.check_value('GuidAndPicture (UUID part 1)', '>Q', 8, 11376937813817407569)
     # StdPicture: [MS-OFORMS] 2.4.13
     stream.check_value('StdPicture (Preamble)', '<L', 4, 0x0000746C)
     size = stream.unpack('<L', 4)
--
libgit2 0.21.4