From 1169ced43df71c6f58d25375e35dbe661f91888f Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sun, 19 Sep 2021 14:23:21 +0100
Subject: [PATCH] Working on port to pypy

---
 bridge_master.py | 2 +-
 mk_voice.py      | 2 +-
 play_ambe.py     | 2 +-
 playback.py      | 2 +-
 read_ambe.py     | 2 +-
 requirements.txt | 3 +--
 voice_lib.py     | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bridge_master.py b/bridge_master.py
index 6123eef..9d37f00 100755
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -33,7 +33,7 @@ This program currently only works with group voice calls.
 
 # Python modules we need
 import sys
-from bitarray import bitarray
+from bit_array import BitArray as bitarray
 from time import time,sleep,perf_counter
 import importlib.util
 import re
diff --git a/mk_voice.py b/mk_voice.py
index f4f4b27..369b79c 100755
--- a/mk_voice.py
+++ b/mk_voice.py
@@ -18,7 +18,7 @@
 #   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 ###############################################################################
 
-from bitarray import bitarray
+from fd_bitarray import bitarray
 from dmr_utils3 import bptc, golay, qr
 from dmr_utils3.utils import bytes_3, bytes_4
 from dmr_utils3.const import EMB, SLOT_TYPE, BS_VOICE_SYNC, BS_DATA_SYNC, LC_OPT
diff --git a/play_ambe.py b/play_ambe.py
index b792aee..a1a50a6 100755
--- a/play_ambe.py
+++ b/play_ambe.py
@@ -20,7 +20,7 @@
 
 # Python modules we need
 import sys
-from bitarray import bitarray
+from bit_array import BitArray as bitarray
 from time import time, sleep
 from importlib import import_module
 from binascii import b2a_hex as bhex
diff --git a/playback.py b/playback.py
index 0551732..3a9653c 100755
--- a/playback.py
+++ b/playback.py
@@ -21,7 +21,7 @@
 
 # Python modules we need
 import sys
-from bitarray import bitarray
+from bit_array import BitArray as bitarray
 from time import time, sleep
 from importlib import import_module
 from random import randint
diff --git a/read_ambe.py b/read_ambe.py
index 3d5506d..e329f1c 100644
--- a/read_ambe.py
+++ b/read_ambe.py
@@ -1,4 +1,4 @@
-from bitarray import bitarray
+from bit_array import BitArray as bitarray
 from itertools import islice
 import os
 import glob
diff --git a/requirements.txt b/requirements.txt
index 6fd9564..c3690e3 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,7 @@
 bitstring>=3.1.5
-bitarray>=0.8.1
+bit_array
 Twisted>=16.3.0
 dmr_utils3>=0.1.19
 configparser>=3.0.0
 mysql-connector
-resettabletimer>=0.7.0
 setproctitle
diff --git a/voice_lib.py b/voice_lib.py
index 7266e67..520c50a 100644
--- a/voice_lib.py
+++ b/voice_lib.py
@@ -1,4 +1,4 @@
-from bitarray import bitarray
+from fd_bitarray import bitarray
 
 words = {
     'all_circuits': [