some pylint changes- super(), class without object, elif after return

Author: barrust

.pylintrc

@@ -134,7 +134,7 @@ expected-line-ending-format=
 bad-functions=map,filter
 
 # Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,b,f,v,m,n,p,hh,st,ex,Run,_
+good-names=i,j,k,b,f,v,m,n,p,d,hh,st,ex,Run,_
 
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata

probables/blooms/bloom.py

@@ -30,7 +30,7 @@ def _verify_not_type_mismatch(second: SimpleBloomT) -> bool:
     return isinstance(second, (BloomFilter, BloomFilterOnDisk))
 
 
-class BloomFilter(object):
+class BloomFilter:
     """Simple Bloom Filter implementation for use in python; It can read and write the
     same format as the c version (https://github.com/barrust/bloom)
 
@@ -610,7 +610,7 @@ def __init__(
         if is_hex_string(hex_string):
             msg = "Loading from hex_string is currently not supported by the on disk Bloom Filter"
             raise NotSupportedError(msg)
-        elif est_elements is not None and false_positive_rate is not None:
+        if est_elements is not None and false_positive_rate is not None:
             fpr, n_hashes, n_bits = self._get_optimized_params(est_elements, false_positive_rate)
             self._set_values(est_elements, fpr, n_hashes, n_bits, hash_function)
 
@@ -668,7 +668,7 @@ def _load(self, filepath: Union[str, Path], hash_function: Union[HashFuncT, None
         self._on_disk = True
 
     def add_alt(self, hashes: HashResultsT) -> None:
-        super(BloomFilterOnDisk, self).add_alt(hashes)
+        super().add_alt(hashes)
         self.__update()
 
     @classmethod

probables/blooms/expandingbloom.py

@@ -276,7 +276,7 @@ def __init__(
         hash_function: Union[HashFuncT, None] = None,
     ) -> None:
         """initialize"""
-        super(RotatingBloomFilter, self).__init__(
+        super().__init__(
             est_elements=est_elements,
             false_positive_rate=false_positive_rate,
             filepath=filepath,

probables/countminsketch/countminsketch.py

@@ -19,7 +19,7 @@
 from ..utilities import MMap, is_valid_file
 
 
-class CountMinSketch(object):
+class CountMinSketch:
     """Simple Count-Min Sketch implementation for use in python;
     It can read and write the same format as the c version
     (https://github.com/barrust/count-min-sketch)
@@ -141,7 +141,7 @@ def __str__(self) -> str:
 
     def __contains__(self, key: KeyT) -> bool:
         """setup the `in` keyword"""
-        return True if self.check(key) != 0 else False
+        return self.check(key) != 0
 
     def __bytes__(self) -> bytes:
         """Export countmin-sketch to `bytes`"""

probables/cuckoo/countingcuckoo.py

@@ -244,7 +244,7 @@ def _insert_fingerprint_alt(
             self._inserted_elements += 1
             self.__unique_elements += 1
             return None
-        elif self.__insert_element(fingerprint, idx_2, count):
+        if self.__insert_element(fingerprint, idx_2, count):
             self._inserted_elements += 1
             self.__unique_elements += 1
             return None
@@ -277,7 +277,7 @@ def _check_if_present(self, idx_1: int, idx_2: int, fingerprint: int) -> Union[i
         """wrapper for checking if fingerprint is already inserted"""
         if fingerprint in [x.finger for x in self.buckets[idx_1]]:
             return idx_1
-        elif fingerprint in [x.finger for x in self.buckets[idx_2]]:
+        if fingerprint in [x.finger for x in self.buckets[idx_2]]:
             return idx_2
         return None
 

probables/cuckoo/cuckoo.py

@@ -18,7 +18,7 @@
 from ..utilities import MMap, get_x_bits, is_valid_file
 
 
-class CuckooFilter(object):
+class CuckooFilter:
     """Simple Cuckoo Filter implementation
 
     Args:
@@ -366,7 +366,7 @@ def _insert_fingerprint(self, fingerprint, idx_1, idx_2):
         if self.__insert_element(fingerprint, idx_1):
             self._inserted_elements += 1
             return None
-        elif self.__insert_element(fingerprint, idx_2):
+        if self.__insert_element(fingerprint, idx_2):
             self._inserted_elements += 1
             return None
 
@@ -444,7 +444,7 @@ def _check_if_present(self, idx_1, idx_2, fingerprint):
         """wrapper for checking if fingerprint is already inserted"""
         if fingerprint in self.buckets[idx_1]:
             return idx_1
-        elif fingerprint in self.buckets[idx_2]:
+        if fingerprint in self.buckets[idx_2]:
             return idx_2
         return None
 
@@ -513,7 +513,7 @@ def _deal_with_insertion(self, finger):
         """some code to handle the insertion the same"""
         if finger is None:
             return
-        elif self.auto_expand:
+        if self.auto_expand:
             self._expand_logic(finger)
         else:
             msg = "The {} is currently full".format(self.__class__.__name__)

probables/utilities.py

@@ -29,7 +29,7 @@ def get_x_bits(num: int, max_bits: int, num_bits: int, right_bits: bool = True)
     return int(bits[:num_bits], 2)
 
 
-class MMap(object):
+class MMap:
     """Simplified mmap.mmap class"""
 
     __slots__ = ("p", "__f", "m", "_closed")