| From f56299a9c998e0bfbd4ab07cafe9eb8444512448 Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Fri, 21 May 2021 12:20:53 +0300 |
| Subject: perf scripts python: exported-sql-viewer.py: Fix warning display |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| commit f56299a9c998e0bfbd4ab07cafe9eb8444512448 upstream. |
| |
| Deprecation warnings are useful only for the developer, not an end user. |
| Display warnings only when requested using the python -W option. This |
| stops the display of warnings like: |
| |
| tools/perf/scripts/python/exported-sql-viewer.py:5102: DeprecationWarning: |
| an integer is required (got type PySide2.QtCore.Qt.AlignmentFlag). |
| Implicit conversion to integers using __int__ is deprecated, and |
| may be removed in a future version of Python. |
| err = app.exec_() |
| |
| Since the warning can be fixed only in PySide2, we must wait for it to |
| be finally fixed there. |
| |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: stable@vger.kernel.org # v5.3+ |
| Link: http://lore.kernel.org/lkml/20210521092053.25683-4-adrian.hunter@intel.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/perf/scripts/python/exported-sql-viewer.py | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/tools/perf/scripts/python/exported-sql-viewer.py |
| +++ b/tools/perf/scripts/python/exported-sql-viewer.py |
| @@ -91,6 +91,11 @@ |
| from __future__ import print_function |
| |
| import sys |
| +# Only change warnings if the python -W option was not used |
| +if not sys.warnoptions: |
| + import warnings |
| + # PySide2 causes deprecation warnings, ignore them. |
| + warnings.filterwarnings("ignore", category=DeprecationWarning) |
| import argparse |
| import weakref |
| import threading |
