mods to address change requests for PR #4

Author: AKOU0

dissect/compat.py

@@ -2,6 +2,8 @@
 Isolate 2.7 compatibility filth.
 '''
 import sys
+from __future__ import unicode_literals
+
 
 major = sys.version_info.major
 minor = sys.version_info.minor
@@ -15,6 +17,8 @@ def iterbytes(byts):
         for c in byts:
             yield ord(c)
 
+    range = xrange       
+
 else:
 
     def iterbytes(byts):

dissect/protos/dns.py

@@ -1,13 +1,3 @@
-
-# py2+3 compat
-
-from __future__ import unicode_literals
-
-try:
-     xrange = xrange
-except:
-     xrange = range
-
 from vstruct2.types import *
 import dissect.protos.inet as vs_inet
 
@@ -172,7 +162,6 @@ def pcb_length(self):
         if self.vsHasField('label'):  # the resize will crash if the label hasn't been set yet w/o this
             self.vsGetField('label').vsResize(size)
 
-
     def pcb_label(self):
         if self.length == 0:
             return
@@ -279,7 +268,7 @@ class DnsQuestionArray(VArray):
     '''
     def __init__(self, reccnt):
         VArray.__init__(self)
-        for i in xrange(reccnt):
+        for i in range(reccnt):
             self.vsAddElement(DnsQuestion())
 
 class DnsOptResourceRecord(VStruct):
@@ -360,7 +349,7 @@ class DnsResourceRecordArray(VArray):
     '''
     def __init__(self, reccnt):
         VArray.__init__(self)
-        for i in xrange(reccnt):
+        for i in range(reccnt):
             self.vsAddElement(DnsResourceRecord())
 
 class DnsMessage(VStruct):
@@ -471,7 +460,7 @@ def getQuestionRecords(self):
         self._cache_qrs = ret
         return ret
 
-    def _getResourceRecords(self, structure):
+    def getResourceRecords(self, structure):
         '''
         Given a DnsResourceRecordArray() structure, return a list of Resource 
         Records as (dnstype, dnsclass, ttl, fqdn, adata) tuples.  If a parser

dissect/protos/inet.py

@@ -49,8 +49,6 @@ class IPv4Addr(uint32):
     def __repr__(self):
         return socket.inet_ntop(socket.AF_INET, bytes(self))
 
-
-
 class IPv6Addr(vbytes):
 
     def __init__(self):