bump dependencies

7 files changed, 10 insertions, 9 deletions

diff --git a/mitmproxy/addonmanager.py b/mitmproxy/addonmanager.py
index 645f3a93..4214d6ea 100644
--- a/mitmproxy/addonmanager.py
+++ b/mitmproxy/addonmanager.py
@@ -42,7 +42,7 @@ def safecall():
         yield
     except (exceptions.AddonHalt, exceptions.OptionsError):
         raise
-    except Exception as e:
+    except Exception:
         etype, value, tb = sys.exc_info()
         tb = cut_traceback(tb, "invoke_addon")
         ctx.log.error(
diff --git a/mitmproxy/addons/core.py b/mitmproxy/addons/core.py
index 0322b4ce..a908dbb3 100644
--- a/mitmproxy/addons/core.py
+++ b/mitmproxy/addons/core.py
@@ -53,7 +53,7 @@ class Core:
         if "body_size_limit" in updated:
             try:
                 human.parse_size(opts.body_size_limit)
-            except ValueError as e:
+            except ValueError:
                 raise exceptions.OptionsError(
                     "Invalid body size limit specification: %s" %
                     opts.body_size_limit
diff --git a/mitmproxy/addons/proxyauth.py b/mitmproxy/addons/proxyauth.py
index f8fc344a..abdc1eac 100644
--- a/mitmproxy/addons/proxyauth.py
+++ b/mitmproxy/addons/proxyauth.py
@@ -152,7 +152,7 @@ class ProxyAuth:
                     p = ctx.options.proxyauth[1:]
                     try:
                         self.htpasswd = passlib.apache.HtpasswdFile(p)
-                    except (ValueError, OSError) as v:
+                    except (ValueError, OSError):
                         raise exceptions.OptionsError(
                             "Could not open htpasswd file: %s" % p
                         )
diff --git a/mitmproxy/addons/view.py b/mitmproxy/addons/view.py
index 1c8bd0ce..8d27840f 100644
--- a/mitmproxy/addons/view.py
+++ b/mitmproxy/addons/view.py
@@ -103,7 +103,7 @@ orders = [
 ]
 
 
-class View(collections.Sequence):
+class View(collections.abc.Sequence):
     def __init__(self):
         super().__init__()
         self._store = collections.OrderedDict()
@@ -638,7 +638,7 @@ class Focus:
             self.flow = flow
 
 
-class Settings(collections.Mapping):
+class Settings(collections.abc.Mapping):
     def __init__(self, view: View) -> None:
         self.view = view
         self._values: typing.MutableMapping[str, typing.Dict] = {}
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index ecb8090b..e5683356 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -84,13 +84,14 @@ class Master:
         exc = None
         try:
             loop()
-        except Exception as e:  # pragma: no cover
+        except Exception:  # pragma: no cover
             exc = traceback.format_exc()
         finally:
             if not self.should_exit.is_set():  # pragma: no cover
                 self.shutdown()
             loop = asyncio.get_event_loop()
-            for p in asyncio.Task.all_tasks():
+            tasks = asyncio.all_tasks(loop) if sys.version_info >= (3, 7) else asyncio.Task.all_tasks(loop)
+            for p in tasks:
                 p.cancel()
             loop.close()
 
diff --git a/mitmproxy/proxy/protocol/http2.py b/mitmproxy/proxy/protocol/http2.py
index eae7f06d..42b61f4d 100644
--- a/mitmproxy/proxy/protocol/http2.py
+++ b/mitmproxy/proxy/protocol/http2.py
@@ -642,7 +642,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
 
         try:
             layer()
-        except exceptions.Http2ZombieException as e:  # pragma: no cover
+        except exceptions.Http2ZombieException:  # pragma: no cover
             pass
         except exceptions.ProtocolException as e:  # pragma: no cover
             self.log(repr(e), "info")
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py
index 8baaa1c4..f1c763b2 100644
--- a/mitmproxy/tools/_main.py
+++ b/mitmproxy/tools/_main.py
@@ -134,7 +134,7 @@ def run(
     except exceptions.OptionsError as e:
         print("%s: %s" % (sys.argv[0], e), file=sys.stderr)
         sys.exit(1)
-    except (KeyboardInterrupt, RuntimeError) as e:
+    except (KeyboardInterrupt, RuntimeError):
         pass
     return master