From 9bad47a2a8383326258d8c808ba5e5684e839c9b Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Fri, 30 Jun 2017 18:47:33 +0200
Subject: Move to Python 3

Tested under Windows 8.1 and MSVC 2017 RC
---
 unittest/constants.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'unittest/constants.py')

diff --git a/unittest/constants.py b/unittest/constants.py
index 0897b42..f3e876a 100644
--- a/unittest/constants.py
+++ b/unittest/constants.py
@@ -1,22 +1,26 @@
-from enum import Enum
 from misc import to_hex
 
+def bb(x):
+    return bytes(x, encoding='ascii')
+
+
 RFC_SECRET_HR = '12345678901234567890'
 RFC_SECRET = to_hex(RFC_SECRET_HR)  # '31323334353637383930...'
+bbRFC_SECRET = bb(RFC_SECRET)
 
 
 # print( repr((RFC_SECRET, RFC_SECRET_, len(RFC_SECRET))) )
 
-class DefaultPasswords(Enum):
-    ADMIN = '12345678'
-    USER = '123456'
-    ADMIN_TEMP = '123123123'
-    USER_TEMP = '234234234'
-    UPDATE = '12345678'
-    UPDATE_TEMP = '123update123'
+class DefaultPasswords:
+    ADMIN = b'12345678'
+    USER = b'123456'
+    ADMIN_TEMP = b'123123123'
+    USER_TEMP = b'234234234'
+    UPDATE = b'12345678'
+    UPDATE_TEMP = b'123update123'
 
 
-class DeviceErrorCode(Enum):
+class DeviceErrorCode:
     STATUS_OK = 0
     BUSY = 1 # busy or busy progressbar in place of wrong_CRC status
     NOT_PROGRAMMED = 3
@@ -25,7 +29,7 @@ class DeviceErrorCode(Enum):
     STATUS_AES_DEC_FAILED = 0xa
 
 
-class LibraryErrors(Enum):
+class LibraryErrors:
     TOO_LONG_STRING = 200
     INVALID_SLOT = 201
     INVALID_HEX_STRING = 202
-- 
cgit v1.2.1