Remove Python 2 Support

software/authbox/api.py

@@ -24,15 +24,14 @@
 
 from __future__ import print_function
 
+import queue
 import sys
 import threading
 import traceback
 import types
 
 from gpiozero import DigitalInputDevice
 
-from authbox.compat import queue
-
 # The line above simplifies imports for other modules that are already importing from api.
 
 # TODO give each object a logger and use that instead of prints

software/authbox/badgereader_wiegand_gpio.py

@@ -17,8 +17,9 @@
 
 from __future__ import division, print_function
 
+import queue
+
 from authbox.api import BaseWiegandPinThread
-from authbox.compat import queue
 
 DEFAULT_QUEUE_SIZE = 100  # more than enough for a scan
 DEFAULT_TIMEOUT_IN_MS = 15

software/authbox/config.py

@@ -15,11 +15,10 @@
 """Config API for Authbox.
 
 """
+import configparser
 import os.path
 import re
 
-from authbox.compat import configparser
-
 # TODO: This is very simplistic, supporting no escapes or indirect lookups
 TEMPLATE_RE = re.compile(r"{((?!\d)\w+)}")
 TIME_RE = re.compile(r"([\d.]+)([smhd])")

software/authbox/gpio_button.py

@@ -15,12 +15,12 @@
 """Abstraction for blinky buttons.
 """
 
+import queue
 import time
 
 import gpiozero
 
 from authbox.api import BasePinThread
-from authbox.compat import queue
 
 
 class Button(BasePinThread):

software/authbox/gpio_buzzer.py

@@ -16,12 +16,12 @@
 """
 from __future__ import print_function
 
+import queue
 import time
 
 import gpiozero
 
 from authbox.api import BasePinThread
-from authbox.compat import queue
 
 OFF = 0
 ON = 1

software/authbox/tests/test_badgereader_hid_keystroking.py

@@ -14,10 +14,10 @@
 
 """Tests for authbox.badgereader_hid_keystroking"""
 
+import queue
 import unittest
 
 import authbox.badgereader_hid_keystroking
-from authbox.compat import queue
 
 
 class BadgereaderTest(unittest.TestCase):

software/authbox/tests/test_badgereader_wiegand_gpio.py

@@ -14,12 +14,12 @@
 
 """Tests for authbox.badgereader_wiegand_gpio"""
 
+import queue
 import threading
 import time
 import unittest
 
 import authbox.badgereader_wiegand_gpio
-from authbox.compat import queue
 
 from . import setup_mock_pin_factory  # noqa: F401
 

software/authbox/tests/test_gpio_button.py

@@ -14,12 +14,12 @@
 
 """Tests for authbox.gpio_button"""
 
+import queue
 import unittest
 from functools import partial
 
 import authbox.gpio_button
 from authbox import fake_gpio_for_testing
-from authbox.compat import queue
 
 from . import setup_mock_pin_factory  # noqa: F401
 

software/authbox/tests/test_gpio_buzzer.py

@@ -14,11 +14,11 @@
 
 """Tests for authbox.gpio_buzzer"""
 
+import queue
 import unittest
 
 import authbox.gpio_buzzer
 from authbox import fake_gpio_for_testing
-from authbox.compat import queue
 
 from . import setup_mock_pin_factory  # noqa: F401
 

software/authbox/tests/test_gpio_relay.py

@@ -14,11 +14,11 @@
 
 """Tests for authbox.gpio_relay"""
 
+import queue
 import unittest
 
 import authbox.gpio_relay
 from authbox import fake_gpio_for_testing
-from authbox.compat import queue
 
 from . import setup_mock_pin_factory  # noqa: F401
 

software/authbox/tests/test_timer.py

@@ -14,10 +14,10 @@
 
 """Tests for authbox.timer"""
 
+import queue
 import unittest
 
 import authbox.timer
-from authbox.compat import queue
 
 from . import setup_mock_pin_factory  # noqa: F401
 

software/authbox/timer.py

@@ -17,11 +17,11 @@
 
 from __future__ import print_function
 
+import queue
 import threading
 import time
 
 from authbox.api import BaseDerivedThread
-from authbox.compat import queue
 
 
 class Timer(BaseDerivedThread):