Working on port to pypy

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

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

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

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

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

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

voice_lib.py

@@ -1,4 +1,4 @@
-from bitarray import bitarray
+from fd_bitarray import bitarray
 
 words = {
     'all_circuits': [