evtx: 2to3

Author: Willi Ballenthin

Evtx/BinaryParser.py

@@ -49,7 +49,7 @@ def hex_dump(src, start_addr=0):
         num_spaces = (start_addr % length)
         num_chars = length - (start_addr % length)
 
-        spaces = " ".join(["  " for i in xrange(num_spaces)])
+        spaces = " ".join(["  " for i in range(num_spaces)])
         s = src[0:num_chars]
         hexa = ' '.join(["{:02X}".format(ord(x)) for x in s])
         printable = s.translate(FILTER)
@@ -61,7 +61,7 @@ def hex_dump(src, start_addr=0):
         src = src[num_chars:]
         remainder_start_addr = base_addr + length
 
-    for i in xrange(0, len(src), length):
+    for i in range(0, len(src), length):
         s = src[i:i + length]
         hexa = ' '.join(["{:02X}".format(ord(x)) for x in s])
         printable = s.translate(FILTER)
@@ -105,7 +105,7 @@ def __call__(self, *args, **kw):
             cache = obj.__cache
         except AttributeError:
             cache = obj.__cache = {}
-        key = (self.func, args[1:], frozenset(kw.items()))
+        key = (self.func, args[1:], frozenset(list(kw.items())))
         if key not in cache:
             cache[key] = self.func(*args, **kw)
         return cache[key]
@@ -229,10 +229,10 @@ def __repr__(self):
         return "Block(buf={!r}, offset={!r})".format(self._buf, self._offset)
 
     def __unicode__(self):
-        return u"BLOCK @ {}.".format(hex(self.offset()))
+        return "BLOCK @ {}.".format(hex(self.offset()))
 
     def __str__(self):
-        return str(unicode(self))
+        return str(self)
 
     def declare_field(self, type, name, offset=None, length=None):
         """

Evtx/Evtx.py

@@ -266,7 +266,7 @@ def make_substitutions(self, substitutions):
         @type substitutions: list of VariantTypeNode
         """
         self._load_xml()
-        return self._xml.format(*map(lambda n: n.xml(), substitutions))
+        return self._xml.format(*[n.xml() for n in substitutions])
 
     def node(self):
         return self._template_node

Evtx/Nodes.py

@@ -108,7 +108,7 @@ def _children(self, max_children=None,
         ofs = self.tag_length()
 
         if max_children:
-            gen = range(max_children)
+            gen = list(range(max_children))
         else:
             gen = itertools.count()
 
@@ -1610,7 +1610,8 @@ def string(self):
                 for _ in range(len(frag) // 2):
                     acc.append("<string></string>\n")
             else:
-                raise "Error parsing uneven substring of NULLs"
+                # TODO: raise a real exception type here
+                raise RuntimeError("Error parsing uneven substring of NULLs")
             bin = bin[len(frag):]
         return "".join(acc)