Death to hashitanyway

hypothesis-extra/hypothesis-datetime/src/hypothesisdatetime/datetime.py

@@ -20,7 +20,6 @@
 import hypothesis.internal.distributions as dist
 from hypothesis.internal.compat import hrange, text_type
 from hypothesis.internal.fixers import equal
-from hypothesis.internal.hashitanyway import normal_hash, hash_everything
 from hypothesis.searchstrategy.strategies import SearchStrategy, \
     strategy, check_data_type
 
@@ -35,8 +34,6 @@
 def equal_datetimes(x, y, fuzzy=False):
     return (x.tzinfo == y.tzinfo) and (x == y)
 
-hash_everything.extend(dt.datetime)(normal_hash)
-
 
 def draw_day_for_month(random, year, month):
     # Validate that we've not got a bad year or month

src/hypothesis/database/__init__.py

@@ -11,7 +11,6 @@
 # END HEADER
 
 from hypothesis.internal.fixers import nice_string
-from hypothesis.internal.hashitanyway import HashItAnyway
 from hypothesis.internal.tracker import Tracker
 from hypothesis.searchstrategy.strategies import BadData, strategy
 from hypothesis.database.formats import JSONFormat
@@ -90,7 +89,6 @@ def __init__(
                 'but backend expects data of type %s' % (
                     self.format.data_type(), self.backend.data_type()
                 )))
-        self.storage_cache = {}
 
     def storage_for(self, descriptor):
         """Get a storage object corresponding to this descriptor.
@@ -99,18 +97,10 @@ def storage_for(self, descriptor):
         x.storage_for(d). You can rely on that behaviour.
 
         """
-        key = HashItAnyway(descriptor)
-        try:
-            return self.storage_cache[key]
-        except KeyError:
-            pass
-
-        result = Storage(
+        return Storage(
             descriptor=descriptor,
             database=self,
             backend=self.backend,
             format=self.format,
             strategy=strategy(descriptor),
         )
-        self.storage_cache[key] = result
-        return result

src/hypothesis/descriptortests.py

@@ -20,14 +20,12 @@
 from collections import namedtuple
 
 from hypothesis import given
-from hypothesis.errors import Exhausted
 from hypothesis.database import ExampleDatabase
 from hypothesis.settings import Settings
 from hypothesis.internal.compat import text_type, integer_types
 from hypothesis.internal.fixers import nice_string, actually_equal
 from hypothesis.database.backend import SQLiteBackend
 from hypothesis.internal.verifier import Verifier
-from hypothesis.internal.hashitanyway import hash_everything
 from hypothesis.searchstrategy.strategies import BuildContext, \
     SearchStrategy, strategy
 
@@ -119,14 +117,6 @@ def is_basic(v):
             supposedly_basic = strat.to_basic(value)
             self.assertTrue(is_basic(supposedly_basic), repr(supposedly_basic))
 
-        def test_produces_two_distinct_hashes(self):
-            try:
-                verifier.falsify(
-                    lambda x, y: hash_everything(x) == hash_everything(y),
-                    descriptor, descriptor)
-            except Exhausted:
-                pass
-
         @descriptor_test
         def test_can_round_trip_through_the_database(self, template):
             empty_db = ExampleDatabase(

src/hypothesis/internal/tracker.py

@@ -42,13 +42,15 @@ def object_to_tracking_key(o):
 class Tracker(object):
 
     def __init__(self):
-        self.contents = {}
+        self.contents = set()
 
     def __len__(self):
         return len(self.contents)
 
     def track(self, x):
         k = object_to_tracking_key(x)
-        n = self.contents.get(k, 0) + 1
-        self.contents[k] = n
-        return n
+        if k in self.contents:
+            return 2
+        else:
+            self.contents.add(k)
+            return 1