Remove Python 2 support

Author: basilfx

poetry.lock

@@ -37,7 +37,6 @@ version = "2.0.0"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-six = "^1.16.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^22.10.0"

pyproject.toml

@@ -1,5 +1,3 @@
-from six.moves import xrange
-
 import unittest
 import tinylink
 
@@ -68,14 +66,14 @@ def test_multiple(self):
 
         size = 0
 
-        for i in xrange(5):
+        for i in range(5):
             size += link.write(bytes([97 + i]))
 
         frames = link.read(size)
 
         self.assertEqual(len(frames), 5)
 
-        for i in xrange(5):
+        for i in range(5):
             self.assertEqual(frames[i].data, bytes([97 + i]))
 
     def test_sync(self):

tests/test_tinylink.py

@@ -1,15 +1,13 @@
-from six.moves import xrange
-from six import StringIO
-
 import csv
-import six
 import sys
 import time
 import select
 import struct
 import tinylink
 import argparse
 
+from io import StringIO
+
 try:
     import serial
 except ImportError:
@@ -53,15 +51,15 @@ def dump(prefix, data):
     result = []
     length = len(data)
 
-    for i in xrange(0, length, 16):
+    for i in range(0, length, 16):
         hexstr = ""
         bytestr = b""
 
-        for j in xrange(0, 16):
+        for j in range(0, 16):
             if i + j < length:
-                b = six.indexbytes(data, i + j)
+                b = data[i + j]
                 hexstr += "%02x " % b
-                bytestr += six.int2byte(b) if 0x20 <= b < 0x7F else b"."
+                bytestr += bytes((b, )) if 0x20 <= b < 0x7F else b"."
             else:
                 hexstr += "   "
 
@@ -149,7 +147,7 @@ def process_stdin(link):
         sys.stdout.write("Parse exception: %s\n" % e)
 
     # Output the data.
-    for i in xrange(repeat):
+    for i in range(repeat):
         sys.stdout.write("### Flags = 0x%04x\n" % frame.flags)
 
         if frame.data:

tinylink/cli.py

@@ -2,7 +2,6 @@
 from . import utils
 
 import struct
-import six
 
 
 class Frame(object):
@@ -12,7 +11,7 @@ class Frame(object):
 
     def __init__(self, data=None, flags=consts.FLAG_NONE, damaged=False):
         if data is not None:
-            if not type(data) == six.binary_type:
+            if type(data) is not bytes:
                 raise ValueError("Provided data must be encoded as bytes.")
         else:
             data = bytes()
@@ -74,10 +73,7 @@ def __init__(self, handle, endianness=consts.LITTLE_ENDIAN,
         self.index = 0
 
         # Python 2 does not allow unpack from bytearray, but Python 3.
-        if six.PY3:
-            self.buffer = self.stream
-        else:
-            self.buffer = buffer(self.stream)
+        self.buffer = self.stream
 
     def write_frame(self, frame):
         """

tinylink/link.py

@@ -1,5 +1,3 @@
-from six.moves import xrange
-
 CRC32_POLYNOMIAL = 0xEDB88320
 CRC32_INITIAL = 0x00000000
 
@@ -15,7 +13,7 @@ def crc32_value(c):
         ulTemp1 = (result >> 8) & 0x00FFFFFF
         ulCRC = (result ^ c) & 0xff
 
-        for i in xrange(8):
+        for i in range(8):
             if ulCRC & 0x01:
                 ulCRC = (ulCRC >> 1) ^ CRC32_POLYNOMIAL
             else: