From b91b89a3416bd601fd05cef2dc51d700b37f9151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 12 May 2017 17:41:38 +0200
Subject: [PATCH] =?UTF-8?q?Make=20pylint=20=E2=99=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qubes/mgmt.py             | 4 ++--
 qubes/storage/__init__.py | 5 +++--
 qubes/vm/mix/net.py       | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/qubes/mgmt.py b/qubes/mgmt.py
index c65ffe20..4965ba18 100644
--- a/qubes/mgmt.py
+++ b/qubes/mgmt.py
@@ -139,8 +139,8 @@ class AbstractQubesMgmt(object):
 
             try:
                 # pylint: disable=protected-access
-                for method, endpoint in func._rpcname:
-                    if method != self.method:
+                for method_name, endpoint in func._rpcname:
+                    if method_name != self.method:
                         continue
                     untrusted_candidates.append((func, endpoint))
             except AttributeError:
diff --git a/qubes/storage/__init__.py b/qubes/storage/__init__.py
index 33d76b33..eb41ef3d 100644
--- a/qubes/storage/__init__.py
+++ b/qubes/storage/__init__.py
@@ -25,6 +25,7 @@
 
 from __future__ import absolute_import
 
+import inspect
 import os
 import os.path
 import string  # pylint: disable=deprecated-module
@@ -394,10 +395,10 @@ class Storage(object):
                     clone_op[name] = asyncio.ensure_future(clone_op_ret)
 
             yield from asyncio.wait(x for x in clone_op.values()
-                if asyncio.isfuture(x))
+                if inspect.isawaitable(x))
 
             for name, clone_op_ret in clone_op.items():
-                if asyncio.isfuture(clone_op_ret):
+                if inspect.isawaitable(clone_op_ret):
                     volume = clone_op_ret.result
                 else:
                     volume = clone_op_ret
diff --git a/qubes/vm/mix/net.py b/qubes/vm/mix/net.py
index 52201167..abf400d5 100644
--- a/qubes/vm/mix/net.py
+++ b/qubes/vm/mix/net.py
@@ -64,6 +64,7 @@ def _setter_ip(self, prop, value):
 
 
 def _setter_netvm(self, prop, value):
+    # pylint: disable=unused-argument
     if value is None:
         return
     if not value.provides_network: