Support Python 3

Author: quentinmit

_hesiod.pyx

@@ -42,7 +42,7 @@ def bind(hes_name, hes_type):
     cdef object py_result
     cdef char * c_result
 
-    name_str, type_str = map(str, (hes_name, hes_type))
+    name_str, type_str = map(bytes, (hes_name, hes_type))
 
     c_result = hesiod_to_bind(__context, name_str, type_str)
     if c_result is NULL:
@@ -62,7 +62,7 @@ def resolve(hes_name, hes_type):
     cdef int err = 0
     cdef char ** c_result = NULL
 
-    name_str, type_str = map(str, (hes_name, hes_type))
+    name_str, type_str = map(bytes, (hes_name, hes_type))
 
     with __lookup_lock:
         c_result = hesiod_resolve(__context, name_str, type_str)

hesiod.py

@@ -24,7 +24,7 @@ def parseRecords(self):
 
 class FilsysLookup(Lookup):
     def __init__(self, name):
-        Lookup.__init__(self, name, 'filsys')
+        Lookup.__init__(self, name, b'filsys')
 
     def parseRecords(self):
         Lookup.parseRecords(self)
@@ -35,35 +35,35 @@ def parseRecords(self):
         for result in self.results:
             priority = 0
             if self.multiRecords:
-                result, priority = result.rsplit(" ", 1)
+                result, priority = result.rsplit(b" ", 1)
                 priority = int(priority)
 
-            parts = result.split(" ")
+            parts = result.split(b" ")
             type = parts[0]
-            if type == 'AFS':
+            if type == b'AFS':
                 self.filsys.append(dict(type=type,
                                         location=parts[1],
                                         mode=parts[2],
                                         mountpoint=parts[3],
                                         priority=priority))
-            elif type == 'NFS':
+            elif type == b'NFS':
                 self.filsys.append(dict(type=type,
                                         remote_location=parts[1],
                                         server=parts[2],
                                         mode=parts[3],
                                         mountpoint=parts[4],
                                         priority=priority))
-            elif type == 'ERR':
+            elif type == b'ERR':
                 self.filsys.append(dict(type=type,
                                         message=parts[1],
                                         priority=priority))
-            elif type == 'UFS':
+            elif type == b'UFS':
                 self.filsys.append(dict(type=type,
                                         device=parts[1],
                                         mode=parts[2],
                                         mountpoint=parts[3],
                                         priority=priority))
-            elif type == 'LOC':
+            elif type == b'LOC':
                 self.filsys.append(dict(type=type,
                                         location=parts[1],
                                         mode=parts[2],
@@ -76,28 +76,28 @@ def parseRecords(self):
 
 class PasswdLookup(Lookup):
     def __init__(self, name):
-        Lookup.__init__(self, name, 'passwd')
+        Lookup.__init__(self, name, b'passwd')
 
     def parseRecords(self):
-        passwd_info = self.results[0].split(':')
+        passwd_info = self.results[0].split(b':')
         passwd_info[2] = int(passwd_info[2])
         passwd_info[3] = int(passwd_info[3])
         self.passwd = struct_passwd(passwd_info)
 
 class UidLookup(PasswdLookup):
     def __init__(self, uid):
-        Lookup.__init__(self, uid, 'uid')
+        Lookup.__init__(self, b'%d' % (uid,), b'uid')
 
 class GroupLookup(Lookup):
     def __init__(self, group):
-        Lookup.__init__(self, group, 'group')
+        Lookup.__init__(self, group, b'group')
 
     def parseRecords(self):
-        group_info = self.results[0].split(':')
+        group_info = self.results[0].split(b':')
         group_info[2] = int(group_info[2])
         members = group_info[3]
-        if members != '':
-            members = members.split(',')
+        if members:
+            members = members.split(b',')
         else:
             members = []
         group_info[3] = members
@@ -106,7 +106,7 @@ def parseRecords(self):
 
 class GidLookup(GroupLookup):
     def __init__(self, gid):
-        Lookup.__init__(self, gid, 'gid')
+        Lookup.__init__(self, b'%d' % (gid,), b'gid')
 
 __all__ = ['bind', 'resolve',
            'Lookup', 'FilsysLookup', 'PasswdLookup', 'UidLookup',