diff --git a/qutebrowser/commands/utils.py b/qutebrowser/commands/utils.py index 271187061..1dfdeae26 100644 --- a/qutebrowser/commands/utils.py +++ b/qutebrowser/commands/utils.py @@ -25,7 +25,7 @@ import inspect from collections import Iterable import qutebrowser.utils.misc as utils -from qutebrowser.commands._command import Command +from qutebrowser.commands.command import Command from qutebrowser.commands.exceptions import CommandError cmd_dict = {} diff --git a/qutebrowser/config/_sections.py b/qutebrowser/config/_sections.py index bab935e14..8bbe3e61f 100644 --- a/qutebrowser/config/_sections.py +++ b/qutebrowser/config/_sections.py @@ -19,7 +19,7 @@ from collections import OrderedDict, ChainMap -from qutebrowser.config._value import SettingValue +from qutebrowser.config.value import SettingValue class Section: diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 31a9d5af9..b4c96e857 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -36,7 +36,7 @@ import qutebrowser.commands.utils as cmdutils import qutebrowser.utils.message as message import qutebrowser.utils.log as log from qutebrowser.config.iniparsers import ReadConfigParser -from qutebrowser.config._conftypes import ValidationError +from qutebrowser.config.conftypes import ValidationError from qutebrowser.commands.exceptions import CommandError diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 601073135..dabc0b92c 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -27,9 +27,9 @@ DATA: The config defaults, an OrderedDict of sections. import re from collections import OrderedDict -from qutebrowser.config._value import SettingValue -import qutebrowser.config._conftypes as types -import qutebrowser.config._sections as sect +from qutebrowser.config.value import SettingValue +import qutebrowser.config.conftypes as types +import qutebrowser.config.sections as sect from qutebrowser.utils.misc import MAXVALS diff --git a/qutebrowser/keyinput/keyparser.py b/qutebrowser/keyinput/keyparser.py index 260ec20bf..c86b60d88 100644 --- a/qutebrowser/keyinput/keyparser.py +++ b/qutebrowser/keyinput/keyparser.py @@ -17,7 +17,7 @@ """Advanced keyparsers.""" -from qutebrowser.keyinput._basekeyparser import BaseKeyParser +from qutebrowser.keyinput.basekeyparser import BaseKeyParser import qutebrowser.utils.message as message from qutebrowser.commands.managers import CommandManager diff --git a/qutebrowser/network/qutescheme.py b/qutebrowser/network/qutescheme.py index 4a02a98cd..c703efafd 100644 --- a/qutebrowser/network/qutescheme.py +++ b/qutebrowser/network/qutescheme.py @@ -27,8 +27,8 @@ import cgi import qutebrowser.utils.log as log import qutebrowser.utils.version as version -from qutebrowser.network._schemehandler import (SchemeHandler, - SpecialNetworkReply) +from qutebrowser.network.schemehandler import (SchemeHandler, + SpecialNetworkReply) from qutebrowser.utils.url import urlstring from qutebrowser.utils.misc import read_file diff --git a/qutebrowser/test/keyinput/test_basekeyparser.py b/qutebrowser/test/keyinput/test_basekeyparser.py index 5dd6cf185..693783c31 100644 --- a/qutebrowser/test/keyinput/test_basekeyparser.py +++ b/qutebrowser/test/keyinput/test_basekeyparser.py @@ -24,7 +24,7 @@ import logging from unittest import TestCase from unittest.mock import Mock -import qutebrowser.keyinput._basekeyparser as basekeyparser +import qutebrowser.keyinput.basekeyparser as basekeyparser from PyQt5.QtCore import Qt diff --git a/qutebrowser/widgets/_completion.py b/qutebrowser/widgets/_completion.py index 90a9f4f28..ba5e3f5fb 100644 --- a/qutebrowser/widgets/_completion.py +++ b/qutebrowser/widgets/_completion.py @@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QItemSelectionModel import qutebrowser.config.config as config import qutebrowser.commands.utils as cmdutils -from qutebrowser.widgets._completiondelegate import CompletionItemDelegate +from qutebrowser.widgets.completiondelegate import CompletionItemDelegate from qutebrowser.config.style import set_register_stylesheet from qutebrowser.utils.completer import Completer diff --git a/qutebrowser/widgets/_tabbedbrowser.py b/qutebrowser/widgets/_tabbedbrowser.py index 6a22389b7..cf9147011 100644 --- a/qutebrowser/widgets/_tabbedbrowser.py +++ b/qutebrowser/widgets/_tabbedbrowser.py @@ -27,7 +27,7 @@ import qutebrowser.config.config as config import qutebrowser.commands.utils as cmdutils import qutebrowser.keyinput.modeman as modeman import qutebrowser.utils.log as log -from qutebrowser.widgets._tabwidget import TabWidget, EmptyTabIcon +from qutebrowser.widgets.tabwidget import TabWidget, EmptyTabIcon from qutebrowser.widgets.webview import WebView from qutebrowser.browser.signalfilter import SignalFilter from qutebrowser.browser.commands import CommandDispatcher diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py index 35c47731d..e38f2d73b 100644 --- a/qutebrowser/widgets/mainwindow.py +++ b/qutebrowser/widgets/mainwindow.py @@ -28,8 +28,8 @@ import qutebrowser.config.config as config import qutebrowser.utils.misc as utils import qutebrowser.utils.message as message from qutebrowser.widgets.statusbar.bar import StatusBar -from qutebrowser.widgets._tabbedbrowser import TabbedBrowser -from qutebrowser.widgets._completion import CompletionView +from qutebrowser.widgets.tabbedbrowser import TabbedBrowser +from qutebrowser.widgets.completion import CompletionView from qutebrowser.utils.usertypes import PromptMode diff --git a/qutebrowser/widgets/statusbar/_keystring.py b/qutebrowser/widgets/statusbar/_keystring.py index a30aec575..1452552ad 100644 --- a/qutebrowser/widgets/statusbar/_keystring.py +++ b/qutebrowser/widgets/statusbar/_keystring.py @@ -17,7 +17,7 @@ """Keychain string displayed in the statusbar.""" -from qutebrowser.widgets.statusbar._textbase import TextBase +from qutebrowser.widgets.statusbar.textbase import TextBase class KeyString(TextBase): diff --git a/qutebrowser/widgets/statusbar/_percentage.py b/qutebrowser/widgets/statusbar/_percentage.py index 424c797cd..978208843 100644 --- a/qutebrowser/widgets/statusbar/_percentage.py +++ b/qutebrowser/widgets/statusbar/_percentage.py @@ -19,7 +19,7 @@ from PyQt5.QtCore import pyqtSlot -from qutebrowser.widgets.statusbar._textbase import TextBase +from qutebrowser.widgets.statusbar.textbase import TextBase class Percentage(TextBase): diff --git a/qutebrowser/widgets/statusbar/_prompt.py b/qutebrowser/widgets/statusbar/_prompt.py index 13ab7b94b..69c8a5126 100644 --- a/qutebrowser/widgets/statusbar/_prompt.py +++ b/qutebrowser/widgets/statusbar/_prompt.py @@ -22,7 +22,7 @@ from PyQt5.QtWidgets import QHBoxLayout, QWidget, QLineEdit import qutebrowser.keyinput.modeman as modeman import qutebrowser.commands.utils as cmdutils -from qutebrowser.widgets.statusbar._textbase import TextBase +from qutebrowser.widgets.statusbar.textbase import TextBase from qutebrowser.widgets.misc import MinimalLineEdit from qutebrowser.utils.usertypes import PromptMode, Question diff --git a/qutebrowser/widgets/statusbar/_text.py b/qutebrowser/widgets/statusbar/_text.py index 87b33ac72..fbc76ee19 100644 --- a/qutebrowser/widgets/statusbar/_text.py +++ b/qutebrowser/widgets/statusbar/_text.py @@ -17,7 +17,7 @@ """Text displayed in the statusbar.""" -from qutebrowser.widgets.statusbar._textbase import TextBase +from qutebrowser.widgets.statusbar.textbase import TextBase class Text(TextBase): diff --git a/qutebrowser/widgets/statusbar/_url.py b/qutebrowser/widgets/statusbar/_url.py index 56148931e..62235afde 100644 --- a/qutebrowser/widgets/statusbar/_url.py +++ b/qutebrowser/widgets/statusbar/_url.py @@ -20,7 +20,7 @@ from PyQt5.QtCore import pyqtSlot, pyqtProperty, Qt from qutebrowser.widgets.webview import LoadStatus -from qutebrowser.widgets.statusbar._textbase import TextBase +from qutebrowser.widgets.statusbar.textbase import TextBase from qutebrowser.config.style import set_register_stylesheet, get_stylesheet diff --git a/qutebrowser/widgets/statusbar/bar.py b/qutebrowser/widgets/statusbar/bar.py index 4101dff41..bdbb52269 100644 --- a/qutebrowser/widgets/statusbar/bar.py +++ b/qutebrowser/widgets/statusbar/bar.py @@ -26,13 +26,13 @@ from PyQt5.QtWidgets import QWidget, QHBoxLayout, QStackedLayout, QSizePolicy import qutebrowser.keyinput.modeman as modeman import qutebrowser.config.config as config from qutebrowser.utils.log import statusbar as logger -from qutebrowser.widgets.statusbar._command import Command -from qutebrowser.widgets.statusbar._progress import Progress -from qutebrowser.widgets.statusbar._text import Text -from qutebrowser.widgets.statusbar._keystring import KeyString -from qutebrowser.widgets.statusbar._percentage import Percentage -from qutebrowser.widgets.statusbar._url import Url -from qutebrowser.widgets.statusbar._prompt import Prompt +from qutebrowser.widgets.statusbar.command import Command +from qutebrowser.widgets.statusbar.progress import Progress +from qutebrowser.widgets.statusbar.text import Text +from qutebrowser.widgets.statusbar.keystring import KeyString +from qutebrowser.widgets.statusbar.percentage import Percentage +from qutebrowser.widgets.statusbar.url import Url +from qutebrowser.widgets.statusbar.prompt import Prompt from qutebrowser.config.style import set_register_stylesheet, get_stylesheet