Fix issues reported by flake8

2 files changed, 13 insertions, 15 deletions

diff --git a/src/blinker/_saferef.py b/src/blinker/_saferef.py
index 8848dea..31864f0 100644
--- a/src/blinker/_saferef.py
+++ b/src/blinker/_saferef.py
@@ -180,6 +180,7 @@ class BoundMethodWeakref:
         self.self_name = str(im_self)
         self.func_name = str(im_func.__name__)
 
+    @classmethod
     def calculate_key(cls, target):
         """Calculate the reference key for this reference.
 
@@ -188,8 +189,6 @@ class BoundMethodWeakref:
         """
         return (id(get_self(target)), id(get_func(target)))
 
-    calculate_key = classmethod(calculate_key)
-
     def __str__(self):
         """Give a friendly representation of the object."""
         return "{}({}.{})".format(
@@ -204,11 +203,11 @@ class BoundMethodWeakref:
         """Whether we are still a valid reference."""
         return self() is not None
 
-    def __cmp__(self, other):
+    def __eq__(self, other):
         """Compare with another reference."""
         if not isinstance(other, self.__class__):
-            return cmp(self.__class__, type(other))
-        return cmp(self.key, other.key)
+            return operator.eq(self.__class__, type(other))
+        return operator.eq(self.key, other.key)
 
     def __call__(self):
         """Return a strong reference to the bound method.
diff --git a/src/blinker/base.py b/src/blinker/base.py
index 467e0ac..247b5cb 100644
--- a/src/blinker/base.py
+++ b/src/blinker/base.py
@@ -138,17 +138,17 @@ class Signal:
                 self.receiver_connected.send(
                     self, receiver=receiver, sender=sender, weak=weak
                 )
-            except:
+            except TypeError as e:
                 self.disconnect(receiver, sender)
-                raise
+                raise e
         if receiver_connected.receivers and self is not receiver_connected:
             try:
                 receiver_connected.send(
                     self, receiver_arg=receiver, sender_arg=sender, weak_arg=weak
                 )
-            except:
+            except TypeError as e:
                 self.disconnect(receiver, sender)
-                raise
+                raise e
         return receiver
 
     def connect_via(self, sender, weak=False):
@@ -203,9 +203,9 @@ class Signal:
         self.connect(receiver, sender=sender, weak=False)
         try:
             yield None
-        except:
+        except Exception as e:
             self.disconnect(receiver)
-            raise
+            raise e
         else:
             self.disconnect(receiver)
 
@@ -223,7 +223,7 @@ class Signal:
 
         """
         warn(
-            "temporarily_connected_to is deprecated; " "use connected_to instead.",
+            "temporarily_connected_to is deprecated; use connected_to instead.",
             DeprecationWarning,
         )
         return self.connected_to(receiver, sender)
@@ -244,8 +244,7 @@ class Signal:
             # for lowest possible cost.
             if __debug__ and sender and len(sender) > 1:
                 raise TypeError(
-                    "send() accepts only one positional "
-                    "argument, %s given" % len(sender)
+                    f"send() accepts only one positional argument, {len(sender)} given"
                 )
             return []
 
@@ -256,7 +255,7 @@ class Signal:
             sender = None
         elif len(sender) > 1:
             raise TypeError(
-                "send() accepts only one positional argument, " "%s given" % len(sender)
+                f"send() accepts only one positional argument, {len(sender)} given"
             )
         else:
             sender = sender[0]