remove py27 compat layer

Author: Kriechi

setup.cfg

@@ -13,9 +13,6 @@ fail_under = 100
 show_missing = True
 exclude_lines =
     pragma: no cover
-omit =
-    src/hpack/compat.py
-    src/hpack/hpack_compat.py
 
 [coverage:paths]
 source =

src/hpack/compat.py

@@ -8,7 +8,6 @@
 import logging
 
 from .table import HeaderTable, table_entry_size
-from .compat import to_byte, to_bytes
 from .exceptions import (
     HPACKDecodingError, OversizedHeaderListError, InvalidTableSizeError
 )
@@ -46,8 +45,8 @@ def _unicode_if_needed(header, raw):
     Provides a header as a unicode string if raw is False, otherwise returns
     it as a bytestring.
     """
-    name = to_bytes(header[0])
-    value = to_bytes(header[1])
+    name = bytes(header[0])
+    value = bytes(header[1])
     if not raw:
         name = name.decode('utf-8')
         value = value.decode('utf-8')
@@ -106,10 +105,10 @@ def decode_integer(data, prefix_bits):
     mask = (0xFF >> (8 - prefix_bits))
 
     try:
-        number = to_byte(data[0]) & mask
+        number = data[0] & mask
         if number == max_number:
             while True:
-                next_byte = to_byte(data[index])
+                next_byte = data[index]
                 index += 1
 
                 if next_byte >= 128:
@@ -457,7 +456,7 @@ def decode(self, data, raw=False):
         while current_index < data_len:
             # Work out what kind of header we're decoding.
             # If the high bit is 1, it's an indexed field.
-            current = to_byte(data[current_index])
+            current = data[current_index]
             indexed = True if current & 0x80 else False
 
             # Otherwise, if the second-highest bit is 1 it's a field that does
@@ -565,11 +564,11 @@ def _decode_literal(self, data, should_index):
         # When should_index is false, if the low four bits of the first byte
         # are nonzero the header name is indexed.
         if should_index:
-            indexed_name = to_byte(data[0]) & 0x3F
+            indexed_name = data[0] & 0x3F
             name_len = 6
             not_indexable = False
         else:
-            high_byte = to_byte(data[0])
+            high_byte = data[0]
             indexed_name = high_byte & 0x0F
             name_len = 4
             not_indexable = high_byte & 0x10
@@ -591,7 +590,7 @@ def _decode_literal(self, data, should_index):
             if len(name) != length:
                 raise HPACKDecodingError("Truncated header block")
 
-            if to_byte(data[0]) & 0x80:
+            if data[0] & 0x80:
                 name = decode_huffman(name)
             total_consumed = consumed + length + 1  # Since we moved forward 1.
 
@@ -603,7 +602,7 @@ def _decode_literal(self, data, should_index):
         if len(value) != length:
             raise HPACKDecodingError("Truncated header block")
 
-        if to_byte(data[0]) & 0x80:
+        if data[0] & 0x80:
             value = decode_huffman(value)
 
         # Updated the total consumed length.

src/hpack/hpack.py

@@ -6,7 +6,6 @@
 An implementation of a bitwise prefix tree specially built for decoding
 Huffman-coded content where we already know the Huffman table.
 """
-from .compat import to_byte, decode_hex
 
 
 class HuffmanEncoder:
@@ -33,8 +32,7 @@ def encode(self, bytes_to_encode):
         # Turn each byte into its huffman code. These codes aren't necessarily
         # octet aligned, so keep track of how far through an octet we are. To
         # handle this cleanly, just use a single giant integer.
-        for char in bytes_to_encode:
-            byte = to_byte(char)
+        for byte in bytes_to_encode:
             bin_int_len = self.huffman_code_list_lengths[byte]
             bin_int = self.huffman_code_list[byte] & (
                 2 ** (bin_int_len + 1) - 1
@@ -65,4 +63,4 @@ def encode(self, bytes_to_encode):
             missing_digits = expected_digits - len(final_num)
             final_num = ('0' * missing_digits) + final_num
 
-        return decode_hex(final_num)
+        return bytes.fromhex(final_num)

src/hpack/huffman.py

@@ -17,11 +17,6 @@
 )
 from hpack.hpack import _dict_to_iterable, _to_bytes
 
-try:
-    unicode = unicode
-except NameError:
-    unicode = str
-
 
 class TestHPACKEncoder:
     # These tests are stolen entirely from the IETF specification examples.
@@ -751,7 +746,7 @@ class TestDictToIterable:
     As much as possible this tries to be exhaustive.
     """
     keys = one_of(
-        text().filter(lambda k: k and not k.startswith(u':')),
+        text().filter(lambda k: k and not k.startswith(':')),
         binary().filter(lambda k: k and not k.startswith(b':'))
     )
 
@@ -765,8 +760,8 @@ def test_ordering(self, special_keys, boring_keys):
         with a colon are emitted first.
         """
         def _prepend_colon(k):
-            if isinstance(k, unicode):
-                return u':' + k
+            if isinstance(k, str):
+                return ':' + k
             else:
                 return b':' + k
 
@@ -801,8 +796,8 @@ def test_ordering_applies_to_encoding(self, special_keys, boring_keys):
         When encoding a dictionary the special keys all appear first.
         """
         def _prepend_colon(k):
-            if isinstance(k, unicode):
-                return u':' + k
+            if isinstance(k, str):
+                return ':' + k
             else:
                 return b':' + k