aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2021-05-27 17:17:02 -0400
committerJohn Snow <jsnow@redhat.com>2021-06-01 16:21:21 -0400
commit81f8c4467c1899ef1ba984c70c328ac0c32af10c (patch)
treebebb78a53f3fb471cb4adb2debf600fe3feabb0d
parentb4d37d8188dbff34f0bf88279eeb5b6cb6d1ff82 (diff)
python: move flake8 config to setup.cfg
Update the comment concerning the flake8 exception to match commit 42c0dd12, whose commit message stated: A note on the flake8 exception: flake8 will warn on *any* bare except, but pylint's is context-aware and will suppress the warning if you re-raise the exception. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Message-id: 20210527211715.394144-19-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
-rw-r--r--python/qemu/machine/.flake82
-rw-r--r--python/setup.cfg3
2 files changed, 3 insertions, 2 deletions
diff --git a/python/qemu/machine/.flake8 b/python/qemu/machine/.flake8
deleted file mode 100644
index 45d8146f3f..0000000000
--- a/python/qemu/machine/.flake8
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-extend-ignore = E722 # Pylint handles this, but smarter. \ No newline at end of file
diff --git a/python/setup.cfg b/python/setup.cfg
index 36b4253e93..52a89a0a29 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -22,6 +22,9 @@ packages =
qemu.machine
qemu.utils
+[flake8]
+extend-ignore = E722 # Prefer pylint's bare-except checks to flake8's
+
[pylint.messages control]
# Disable the message, report, category or checker with the given id(s). You
# can either give multiple identifiers separated by comma (,) or put this