Fixes to byte/str handling in the dhcp client

sangoma · Aug 10, 2017 · 646b3c4 · 646b3c4
1 parent 99a14e6
commit 646b3c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pnet/dhcp4/__init__.py b/pnet/dhcp4/__init__.py
@@ -1,4 +1,5 @@
 import os
+import sys
 import struct
 import socket
 import enum
@@ -11,6 +12,10 @@
 COOKIE = b'c\x82Sc'  # [0x63, 0x82, 0x53, 0x63])
 
 
+if sys.version_info >= (3, 0):
+    ord = lambda x: x
+
+
 class DHCPOpCode(enum.IntEnum):
     Request = 1
     Reply = 2
@@ -105,7 +110,7 @@ def message_type(self):
 
 def get_vendor_info():
     sysname, _, release, _, machine = os.uname()
-    return b'pydhcp4:{}-{}:{}'.format(sysname, release, machine)
+    return 'pydhcp4:{}-{}:{}'.format(sysname, release, machine)
 
 
 def get_client_id(chaddr):

diff --git a/pnet/dhcp4/options.py b/pnet/dhcp4/options.py
@@ -1,6 +1,11 @@
+import sys
 import enum
 
 
+if sys.version_info >= (3, 0):
+    ord = lambda x: x
+
+
 class DHCPOption(enum.IntEnum):
     Padding = 0
     SubnetMask = 1