From d56344f46a4601c9875be33fc75cdec8c1ea1bba Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 21 Jan 2014 15:46:29 +0100 Subject: [PATCH] Move some things from x.foo.foo to x.foo (__init__.py) --- qutebrowser/commands/{commands.py => __init__.py} | 0 qutebrowser/commands/utils.py | 6 +++--- qutebrowser/widgets/mainwindow.py | 2 +- qutebrowser/widgets/statusbar/{statusbar.py => __init__.py} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename qutebrowser/commands/{commands.py => __init__.py} (100%) rename qutebrowser/widgets/statusbar/{statusbar.py => __init__.py} (100%) diff --git a/qutebrowser/commands/commands.py b/qutebrowser/commands/__init__.py similarity index 100% rename from qutebrowser/commands/commands.py rename to qutebrowser/commands/__init__.py diff --git a/qutebrowser/commands/utils.py b/qutebrowser/commands/utils.py index 550c9aeb1..d1b64f497 100644 --- a/qutebrowser/commands/utils.py +++ b/qutebrowser/commands/utils.py @@ -15,10 +15,10 @@ def register_all(): """Register and initialize all commands.""" # We do this here to avoid a circular import, since commands.commands # imports Command from this module. - import qutebrowser.commands.commands + import qutebrowser.commands for (name, cls) in inspect.getmembers( - qutebrowser.commands.commands, (lambda o: inspect.isclass(o) and - o.__module__ == 'qutebrowser.commands.commands')): + qutebrowser.commands, (lambda o: inspect.isclass(o) and + o.__module__ == 'qutebrowser.commands')): obj = cls() if isinstance(obj.name, str): names = [obj.name] diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py index eb28c3cf5..0e0b8ac49 100644 --- a/qutebrowser/widgets/mainwindow.py +++ b/qutebrowser/widgets/mainwindow.py @@ -1,6 +1,6 @@ from PyQt5.QtWidgets import QMainWindow, QVBoxLayout, QWidget -from qutebrowser.widgets.statusbar.statusbar import StatusBar +from qutebrowser.widgets.statusbar import StatusBar from qutebrowser.widgets.browser import TabbedBrowser class MainWindow(QMainWindow): diff --git a/qutebrowser/widgets/statusbar/statusbar.py b/qutebrowser/widgets/statusbar/__init__.py similarity index 100% rename from qutebrowser/widgets/statusbar/statusbar.py rename to qutebrowser/widgets/statusbar/__init__.py