Shrink compat.py

Author: Zac-HD

.flake8

@@ -1,7 +1,6 @@
 [flake8]
 
 exclude =
-    compat.py,
     hypothesis-python/src/hypothesis/vendor/*,
     test_reflection.py,
     test_imports.py,
@@ -15,7 +14,3 @@ ignore =
     B008,B011,
     # flake8-bandit security warnings we disagree with or don't mind
     S101,S102,S105,S110,S307,S311,S404,S6
-
-# Use flake8-alfred to forbid builtins that require compatibility wrappers.
-warn-symbols=
-    bytes=Instead of bytes(), use hbytes() or binary_type

hypothesis-python/.coveragerc

@@ -21,6 +21,5 @@ exclude_lines =
     __copy__
     __deepcopy__
     except ImportError:
-    if PY2:
     assert all\(.+\)
     if __reserved is not not_set:

hypothesis-python/docs/examples.rst

@@ -164,7 +164,7 @@ So, convinced that our implementation is broken, we write a better one:
 .. code:: python
 
     def sort_nodes(xs):
-        for i in hrange(1, len(xs)):
+        for i in range(1, len(xs)):
             j = i - 1
             while j >= 0:
                 if xs[j].sorts_before(xs[j + 1]):

hypothesis-python/src/hypothesis/_settings.py

@@ -33,7 +33,6 @@
     InvalidArgument,
     InvalidState,
 )
-from hypothesis.internal.compat import integer_types, quiet_raise, string_types
 from hypothesis.internal.reflection import get_pretty_function_description
 from hypothesis.internal.validation import check_type, try_convert
 from hypothesis.utils.conventions import not_set
@@ -308,14 +307,14 @@ def register_profile(name, parent=None, **kwargs):
         keyword arguments for each setting that will be set differently to
         parent (or settings.default, if parent is None).
         """
-        check_type(string_types, name, "name")
+        check_type(str, name, "name")
         settings._profiles[name] = settings(parent=parent, **kwargs)
 
     @staticmethod
     def get_profile(name):
         # type: (str) -> settings
         """Return the profile with the given name."""
-        check_type(string_types, name, "name")
+        check_type(str, name, "name")
         try:
             return settings._profiles[name]
         except KeyError:
@@ -330,7 +329,7 @@ def load_profile(name):
         Any setting not defined in the profile will be the library
         defined default for that setting.
         """
-        check_type(string_types, name, "name")
+        check_type(str, name, "name")
         settings._current_profile = name
         settings._assign_default_internal(settings.get_profile(name))
 
@@ -578,18 +577,16 @@ def _validate_deadline(x):
         "number of milliseconds, or None to disable the per-test-case deadline."
         % (x, type(x).__name__)
     )
-    if isinstance(x, integer_types + (float,)):
+    if isinstance(x, (int, float)):
         if isinstance(x, bool):
             raise invalid_deadline_error
         try:
             x = duration(milliseconds=x)
         except OverflowError:
-            quiet_raise(
-                InvalidArgument(
-                    "deadline=%r is invalid, because it is too large to represent "
-                    "as a timedelta. Use deadline=None to disable deadlines." % (x,)
-                )
-            )
+            raise InvalidArgument(
+                "deadline=%r is invalid, because it is too large to represent "
+                "as a timedelta. Use deadline=None to disable deadlines." % (x,)
+            ) from None
     if isinstance(x, datetime.timedelta):
         if x <= datetime.timedelta(0):
             raise InvalidArgument(

hypothesis-python/src/hypothesis/control.py

@@ -18,7 +18,6 @@
 
 from hypothesis import Verbosity, settings
 from hypothesis.errors import CleanupFailed, InvalidArgument, UnsatisfiedAssumption
-from hypothesis.internal.compat import string_types
 from hypothesis.internal.conjecture.data import ConjectureData
 from hypothesis.internal.validation import check_type
 from hypothesis.reporting import report, verbose_report
@@ -171,7 +170,7 @@ def target(observation, label=""):
     check_type(float, observation, "observation")
     if math.isinf(observation) or math.isnan(observation):
         raise InvalidArgument("observation=%r must be a finite float." % observation)
-    check_type(string_types, label, "label")
+    check_type(str, label, "label")
 
     context = _current_build_context.value
     if context is None:

hypothesis-python/src/hypothesis/core.py

@@ -24,6 +24,8 @@
 import traceback
 import warnings
 import zlib
+from inspect import getfullargspec
+from io import StringIO
 from random import Random
 from unittest import TestCase
 
@@ -54,13 +56,9 @@
 )
 from hypothesis.executors import new_style_executor
 from hypothesis.internal.compat import (
-    PY2,
     bad_django_TestCase,
     benchmark_time,
-    binary_type,
     get_type_hints,
-    getfullargspec,
-    hbytes,
     int_from_bytes,
     qualname,
 )
@@ -95,7 +93,7 @@
     SearchStrategy,
 )
 from hypothesis.utils.conventions import infer
-from hypothesis.vendor.pretty import CUnicodeIO, RepresentationPrinter
+from hypothesis.vendor.pretty import RepresentationPrinter
 from hypothesis.version import __version__
 
 if False:
@@ -182,9 +180,7 @@ def accept(test):
 
 
 def encode_failure(buffer):
-    # This needs to be a real bytes() instance, so we use binary_type()
-    # instead of hbytes() here.
-    buffer = binary_type(buffer)
+    buffer = bytes(buffer)
     compressed = zlib.compress(buffer)
     if len(compressed) < len(buffer):
         buffer = b"\1" + compressed
@@ -308,10 +304,7 @@ class ArtificialDataForExample(ConjectureData):
     def __init__(self, kwargs):
         self.__draws = 0
         self.__kwargs = kwargs
-
-        super().__init__(
-            max_length=0, prefix=hbytes(), random=None,
-        )
+        super().__init__(max_length=0, prefix=b"", random=None)
 
     def draw_bits(self, n):
         raise NotImplementedError()  # pragma: no cover
@@ -562,7 +555,7 @@ def run(data):
                             text_repr[0] = arg_string(test, args, kwargs)
 
                         if print_example or current_verbosity() >= Verbosity.verbose:
-                            output = CUnicodeIO()
+                            output = StringIO()
 
                             printer = RepresentationPrinter(output)
                             if print_example:
@@ -1088,18 +1081,8 @@ def wrapped_test(*arguments, **kwargs):
                     # full of Hypothesis internals they don't care about.
                     # We have to do this inline, to avoid adding another
                     # internal stack frame just when we've removed the rest.
-                    if PY2:
-                        # Python 2 doesn't have Exception.with_traceback(...);
-                        # instead it has a three-argument form of the `raise`
-                        # statement.  Unfortunately this is a SyntaxError on
-                        # Python 3, and before Python 2.7.9 it was *also* a
-                        # SyntaxError to use it in a nested function so we
-                        # can't `exec` or `eval` our way out (BPO-21591).
-                        # So unless we break some versions of Python 2, none
-                        # of them get traceback elision.
-                        raise
-                    # On Python 3, we swap out the real traceback for our
-                    # trimmed version.  Using a variable ensures that the line
+                    #
+                    # Using a variable for our trimmed error ensures that the line
                     # which will actually appear in tracebacks is as clear as
                     # possible - "raise the_error_hypothesis_found".
                     the_error_hypothesis_found = e.with_traceback(

hypothesis-python/src/hypothesis/database.py

@@ -20,7 +20,6 @@
 
 from hypothesis.configuration import mkdir_p, storage_directory
 from hypothesis.errors import HypothesisException, HypothesisWarning
-from hypothesis.internal.compat import hbytes
 from hypothesis.utils.conventions import not_set
 
 
@@ -124,10 +123,10 @@ def fetch(self, key):
         yield from self.data.get(key, ())
 
     def save(self, key, value):
-        self.data.setdefault(key, set()).add(hbytes(value))
+        self.data.setdefault(key, set()).add(bytes(value))
 
     def delete(self, key, value):
-        self.data.get(key, set()).discard(hbytes(value))
+        self.data.get(key, set()).discard(bytes(value))
 
     def close(self):
         pass
@@ -167,7 +166,7 @@ def fetch(self, key):
         for path in os.listdir(kp):
             try:
                 with open(os.path.join(kp, path), "rb") as i:
-                    yield hbytes(i.read())
+                    yield i.read()
             except OSError:
                 pass
 

hypothesis-python/src/hypothesis/extra/lark.py

@@ -34,14 +34,14 @@
 Lark, unless someone volunteers to either fund or do the maintainence.
 """
 
+from inspect import getfullargspec
 
 import attr
 import lark
 from lark.grammar import NonTerminal, Terminal
 
 import hypothesis.strategies._internal.core as st
 from hypothesis.errors import InvalidArgument
-from hypothesis.internal.compat import getfullargspec, string_types
 from hypothesis.internal.conjecture.utils import calc_label_from_name
 from hypothesis.internal.validation import check_type
 from hypothesis.strategies._internal import SearchStrategy
@@ -188,7 +188,7 @@ def calc_has_reusable_values(self, recur):
 
 def check_explicit(name):
     def inner(value):
-        check_type(string_types, value, "value drawn from " + name)
+        check_type(str, value, "value drawn from " + name)
         return value
 
     return inner