Merge branch 'master' into django-pagination

Author: bzaczynski

hashtable/01_hashtable_prototype/07_use_defensive_copying/hashtable.py

@@ -46,7 +46,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return [pair for pair in self._pairs.copy() if pair]
+        return [pair for pair in self._pairs if pair]
 
     def _index(self, key):
         return hash(key) % len(self)

hashtable/01_hashtable_prototype/08_get_the_keys_and_values/hashtable.py

@@ -46,7 +46,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {pair for pair in self._pairs.copy() if pair}
+        return {pair for pair in self._pairs if pair}
 
     @property
     def values(self):

hashtable/01_hashtable_prototype/09_report_the_hash_tables_length/hashtable.py

@@ -48,7 +48,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {pair for pair in self._slots.copy() if pair}
+        return {pair for pair in self._slots if pair}
 
     @property
     def values(self):

hashtable/01_hashtable_prototype/10_make_the_hash_table_iterable/hashtable.py

@@ -51,7 +51,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {pair for pair in self._slots.copy() if pair}
+        return {pair for pair in self._slots if pair}
 
     @property
     def values(self):

hashtable/01_hashtable_prototype/11_represent_the_hash_table_in_text/hashtable.py

@@ -68,7 +68,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {pair for pair in self._slots.copy() if pair}
+        return {pair for pair in self._slots if pair}
 
     @property
     def values(self):

hashtable/01_hashtable_prototype/12_test_the_equality_of_hash_tables/hashtable.py

@@ -78,7 +78,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {pair for pair in self._slots.copy() if pair}
+        return {pair for pair in self._slots if pair}
 
     @property
     def values(self):

hashtable/02_linear_probing/hashtable.py

@@ -95,9 +95,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {
-            pair for pair in self._slots.copy() if pair not in (None, DELETED)
-        }
+        return {pair for pair in self._slots if pair not in (None, DELETED)}
 
     @property
     def values(self):

hashtable/02_linear_probing/test_hashtable.py

@@ -305,7 +305,7 @@ def test_should_compare_equal_different_capacity():
     assert h1 == h2
 
 
-@patch("builtins.hash", return_value=42)
+@patch("builtins.hash", return_value=24)
 def test_should_detect_and_resolve_hash_collisions(mock_hash):
     hash_table = HashTable(capacity=100)
     hash_table["hola"] = "hello"
@@ -314,9 +314,9 @@ def test_should_detect_and_resolve_hash_collisions(mock_hash):
 
     assert len(hash_table) == 3
 
-    assert hash_table._slots[42] == ("hola", "hello")
-    assert hash_table._slots[43] == (98.6, 37)
-    assert hash_table._slots[44] == (False, True)
+    assert hash_table._slots[24] == ("hola", "hello")
+    assert hash_table._slots[25] == (98.6, 37)
+    assert hash_table._slots[26] == (False, True)
 
 
 @patch("builtins.hash", side_effect=[2, 1, 1])
@@ -358,7 +358,7 @@ def test_should_raise_memory_error_when_not_enough_capacity():
     assert exception_info.value.args[0] == "Not enough capacity"
 
 
-@patch("builtins.hash", return_value=42)
+@patch("builtins.hash", return_value=24)
 def test_should_get_collided_values(mock_hash):
     hash_table = HashTable(capacity=3)
     hash_table["hola"] = "hello"

hashtable/03_autoresize/hashtable.py

@@ -96,9 +96,7 @@ def get(self, key, default=None):
 
     @property
     def pairs(self):
-        return {
-            pair for pair in self._slots.copy() if pair not in (None, DELETED)
-        }
+        return {pair for pair in self._slots if pair not in (None, DELETED)}
 
     @property
     def values(self):

hashtable/03_autoresize/test_hashtable.py

@@ -309,7 +309,7 @@ def test_should_compare_equal_different_capacity():
     assert h1 == h2
 
 
-@patch("builtins.hash", return_value=42)
+@patch("builtins.hash", return_value=24)
 def test_should_detect_and_resolve_hash_collisions(mock_hash):
     hash_table = HashTable(capacity=100)
     hash_table["hola"] = "hello"
@@ -318,9 +318,9 @@ def test_should_detect_and_resolve_hash_collisions(mock_hash):
 
     assert len(hash_table) == 3
 
-    assert hash_table._slots[42] == ("hola", "hello")
-    assert hash_table._slots[43] == (98.6, 37)
-    assert hash_table._slots[44] == (False, True)
+    assert hash_table._slots[24] == ("hola", "hello")
+    assert hash_table._slots[25] == (98.6, 37)
+    assert hash_table._slots[26] == (False, True)
 
 
 @patch("builtins.hash", side_effect=[2, 1, 1])
@@ -369,7 +369,7 @@ def test_should_double_capacity():
     }
 
 
-@patch("builtins.hash", return_value=42)
+@patch("builtins.hash", return_value=24)
 def test_should_get_collided_values(mock_hash):
     hash_table = HashTable(capacity=3)
     hash_table["hola"] = "hello"