commit 1a79a9cd9dee37c1b0b52785816d6f8ce76eac82
author Richard Frankel <rofrankel@google.com> Mon May 09 23:09:05 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 09 23:09:05 2016 +0000
tree 37654275201d9726b73ae7478a13ae05ec0825d3
parent 06e3b50e480cadc6f218cbed22a2f69d6e8653ee
parent 61c1db96e0e854fde2f2a60b548e059f1804b522

Merge "conman: Delete persisted options when stopping an AP or client." into wifitv

conman/connection_manager.py

diff --git a/conman/connection_manager.py b/conman/connection_manager.py
index e05d3f7..d9ccefc 100755
--- a/conman/connection_manager.py
+++ b/conman/connection_manager.py
@@ -12,6 +12,9 @@
 import subprocess
 import time
 
+# This is in site-packages on the device, but not when running tests, and so
+# raises lint errors.
+# pylint: disable=g-bad-import-order
 import pyinotify
 
 import cycler

conman/interface_test.py

diff --git a/conman/interface_test.py b/conman/interface_test.py
index f6e03d2..bea0d24 100755
--- a/conman/interface_test.py
+++ b/conman/interface_test.py
@@ -7,6 +7,9 @@
 import shutil
 import tempfile
 
+# This is in site-packages on the device, but not when running tests, and so
+# raises lint errors.
+# pylint: disable=g-bad-import-order
 import wpactrl
 
 import interface