From c3afa1113671cff956d9ebf0fc102f4fe9750f68 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 28 May 2022 15:09:32 +1200
Subject: import/variable name clashes after PyQt import rewrite

Since we are no doing "from qt import sql" instead of using qt.sql in
the code the submodule names are clashing with other names in the code
now. pylint told me about these ones.
---
 qutebrowser/mainwindow/mainwindow.py    | 12 ++++++------
 qutebrowser/mainwindow/tabbedbrowser.py |  6 +++---
 tests/unit/misc/test_sql.py             | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 5552e2660..2004fd603 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -412,25 +412,25 @@ class MainWindow(widgets.QWidget):
         self._vbox.removeWidget(self.tabbed_browser.widget)
         self._vbox.removeWidget(self._downloadview)
         self._vbox.removeWidget(self.status)
-        widgets: List[widgets.QWidget] = [self.tabbed_browser.widget]
+        widgets_: List[widgets.QWidget] = [self.tabbed_browser.widget]
 
         downloads_position = config.val.downloads.position
         if downloads_position == 'top':
-            widgets.insert(0, self._downloadview)
+            widgets_.insert(0, self._downloadview)
         elif downloads_position == 'bottom':
-            widgets.append(self._downloadview)
+            widgets_.append(self._downloadview)
         else:
             raise ValueError("Invalid position {}!".format(downloads_position))
 
         status_position = config.val.statusbar.position
         if status_position == 'top':
-            widgets.insert(0, self.status)
+            widgets_.insert(0, self.status)
         elif status_position == 'bottom':
-            widgets.append(self.status)
+            widgets_.append(self.status)
         else:
             raise ValueError("Invalid position {}!".format(status_position))
 
-        for widget in widgets:
+        for widget in widgets_:
             self._vbox.addWidget(widget)
 
     def _load_state_geometry(self):
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 55fb08edc..000c2f841 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -298,15 +298,15 @@ class TabbedBrowser(widgets.QWidget):
         We don't implement this as generator so we can delete tabs while
         iterating over the list.
         """
-        widgets = []
+        widgets_ = []
         for i in range(self.widget.count()):
             widget = self.widget.widget(i)
             if widget is None:
                 log.webview.debug(  # type: ignore[unreachable]
                     "Got None-widget in tabbedbrowser!")
             else:
-                widgets.append(widget)
-        return widgets
+                widgets_.append(widget)
+        return widgets_
 
     def _update_window_title(self, field=None):
         """Change the window title to match the current tab.
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 6b6a9f04c..b968baf17 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -25,7 +25,7 @@ import hypothesis
 from hypothesis import strategies
 
 from qutebrowser.misc import sql
-from qutebrowser.qt import sql
+from qutebrowser.qt import sql as qtsql
 
 
 pytestmark = pytest.mark.usefixtures('data_tmpdir')
@@ -95,13 +95,13 @@ class TestSqlError:
         (sql.SqliteErrorCode.CONSTRAINT, sql.BugError),
     ])
     def test_known(self, error_code, exception):
-        sql_err = sql.QSqlError("driver text", "db text", sql.QSqlError.ErrorType.UnknownError,
+        sql_err = qtsql.QSqlError("driver text", "db text", qtsql.QSqlError.ErrorType.UnknownError,
                             error_code)
         with pytest.raises(exception):
             sql.raise_sqlite_error("Message", sql_err)
 
     def test_logging(self, caplog):
-        sql_err = sql.QSqlError("driver text", "db text", sql.QSqlError.ErrorType.UnknownError, '23')
+        sql_err = qtsql.QSqlError("driver text", "db text", qtsql.QSqlError.ErrorType.UnknownError, '23')
         with pytest.raises(sql.BugError):
             sql.raise_sqlite_error("Message", sql_err)
 
@@ -115,7 +115,7 @@ class TestSqlError:
 
     @pytest.mark.parametrize('klass', [sql.KnownError, sql.BugError])
     def test_text(self, klass):
-        sql_err = sql.QSqlError("driver text", "db text")
+        sql_err = qtsql.QSqlError("driver text", "db text")
         err = klass("Message", sql_err)
         assert err.text() == "db text"
 
@@ -391,10 +391,10 @@ class TestTransaction:
             my_table.insert({'column': 1})
             my_table.insert({'column': 2})
 
-            db2 = sql.QSqlDatabase.addDatabase('QSQLITE', 'db2')
+            db2 = qtsql.QSqlDatabase.addDatabase('QSQLITE', 'db2')
             db2.setDatabaseName(database.qt_database().databaseName())
             db2.open()
-            query = sql.QSqlQuery(db2)
+            query = qtsql.QSqlQuery(db2)
             query.exec('select count(*) from my_table')
             query.next()
             assert query.record().value(0) == 0
-- 
cgit v1.2.3-54-g00ecf