pep8 fixes

qutebrowser/__init__.py

@@ -1 +1 @@
-
+"""A vim like browser based on Qt"""

qutebrowser/app.py

@@ -13,6 +13,7 @@ from qutebrowser.widgets.mainwindow import MainWindow
 from qutebrowser.commands.keys import KeyParser
 from qutebrowser.utils.appdirs import AppDirs
 
+
 class QuteBrowser(QApplication):
     """Main object for QuteBrowser"""
     dirs = None  # AppDirs - config/cache directories

qutebrowser/commands/__init__.py

@@ -19,79 +19,95 @@ A command class can set the following properties:
 
 from qutebrowser.commands.utils import Command
 
+
 class Open(Command):
     nargs = 1
     split_args = False
     desc = 'Open a page'
 
+
 class TabOpen(Command):
     nargs = 1
     split_args = False
     desc = 'Open a page in a new tab'
 
+
 class TabClose(Command):
     nargs = 0
     desc = 'Close the current tab'
     # FIXME also close [count]th tab
 
+
 class TabNext(Command):
     nargs = 0
     desc = 'Switch to the next tab'
     # FIXME also support [count]
 
+
 class TabPrev(Command):
     nargs = 0
     desc = 'Switch to the previous tab'
     # FIXME also support [count]
 
+
 class Quit(Command):
     name = ['quit', 'q']
     nargs = 0
     desc = 'Quit qutebrowser'
 
+
 class Reload(Command):
     nargs = 0
     desc = 'Reload the current page'
 
+
 class Stop(Command):
     nargs = 0
     desc = 'Stop loading the current page'
 
+
 class Back(Command):
     nargs = 0
     desc = 'Go back one page in the history'
     # FIXME also support [count]
 
+
 class Forward(Command):
     nargs = 0
     desc = 'Go forward one page in the history'
     # FIXME also support [count]
 
+
 class Print(Command):
     nargs = 0
     desc = 'Print the current page'
 
+
 class Scroll(Command):
     nargs = 2
     count = True
     hide = True
 
+
 class Undo(Command):
     nargs = 0
     desc = 'Undo closing a tab'
 
+
 class ScrollPercX(Command):
     nargs = '?'
     count = True
     hide = True
     name = 'scroll_perc_x'
 
+
 class ScrollPercY(Command):
     nargs = '?'
     count = True
     hide = True
     name = 'scroll_perc_y'
 
+
 class PyEval(Command):
     nargs = 1
     split_args = False

qutebrowser/commands/keys.py

@@ -6,6 +6,7 @@ from PyQt5.QtCore import QObject, pyqtSignal
 from qutebrowser.commands.utils import (CommandParser, ArgumentCountError,
                                         NoSuchCommandError)
 
+
 class KeyParser(QObject):
     """Parser for vim-like key sequences"""
     keystring = ''  # The currently entered key sequence

qutebrowser/commands/utils.py

@@ -10,12 +10,15 @@ from qutebrowser.utils.completion import CompletionModel
 
 cmd_dict = {}
 
+
 class ArgumentCountError(TypeError):
     pass
 
+
 class NoSuchCommandError(ValueError):
     pass
 
+
 def register_all():
     """Register and initialize all commands."""
     # We do this here to avoid a circular import, since commands.commands
@@ -32,6 +35,7 @@ def register_all():
         for n in names:
             cmd_dict[n] = obj
 
+
 class CommandParser(QObject):
     """Parser for qutebrowser commandline commands"""
     text = ''
@@ -84,6 +88,7 @@ class CommandParser(QObject):
                 raise
         self._run(count=count)
 
+
 class CommandCompletionModel(CompletionModel):
     # pylint: disable=abstract-method
     def __init__(self, parent=None):
@@ -96,6 +101,7 @@ class CommandCompletionModel(CompletionModel):
         self._data['Commands'] = sorted(cmdlist)
         self.init_data()
 
+
 class Command(QObject):
     """Base skeleton for a command. See the module help for
     qutebrowser.commands.commands for details.

qutebrowser/utils/__init__.py

@@ -1,5 +1,6 @@
 from PyQt5.QtCore import QUrl
 
+
 def qurl(url):
     if isinstance(url, QUrl):
         return url

qutebrowser/utils/completion.py

@@ -3,6 +3,7 @@ from collections import OrderedDict
 from PyQt5.QtCore import (QAbstractItemModel, Qt, QModelIndex, QVariant,
                           QSortFilterProxyModel, pyqtSignal)
 
+
 class CompletionModel(QAbstractItemModel):
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -110,6 +111,7 @@ class CompletionModel(QAbstractItemModel):
                 newitem = CompletionItem(item, newcat)
                 newcat.children.append(newitem)
 
+
 class CompletionItem():
     parent = None
     _data = None
@@ -146,6 +148,7 @@ class CompletionItem():
             return self.parent.children.index(self)
         return 0
 
+
 class CompletionFilterModel(QSortFilterProxyModel):
     _pattern = None
     pattern_changed = pyqtSignal(str)

qutebrowser/utils/config.py

@@ -60,6 +60,7 @@ _MONOSPACE = ['Monospace', 'DejaVu Sans Mono', 'Consolas', 'Monaco',
 
 MONOSPACE = ', '.join(_MONOSPACE)
 
+
 def init(confdir):
     global config, colordict
     config = Config(confdir)
@@ -68,9 +69,11 @@ def init(confdir):
     except KeyError:
         colordict = ColorDict()
 
+
 def get_stylesheet(template):
     return template.strip().format(color=colordict, monospace=MONOSPACE)
 
+
 class ColorDict(dict):
     def __getitem__(self, key):
         try:
@@ -90,6 +93,7 @@ class ColorDict(dict):
         except KeyError:
             return None
 
+
 class Config(ConfigParser):
     """Our own ConfigParser"""
     configdir = None

qutebrowser/widgets/browser.py

@@ -1,7 +1,7 @@
 import logging
 
 from PyQt5.QtWidgets import QShortcut
-from PyQt5.QtCore import QUrl, pyqtSignal, Qt, QPoint, QEvent
+from PyQt5.QtCore import QUrl, pyqtSignal, Qt, QEvent
 from PyQt5.QtPrintSupport import QPrintPreviewDialog
 from PyQt5.QtWebKitWidgets import QWebView, QWebPage
 
@@ -9,6 +9,7 @@ import qutebrowser.utils as utils
 import qutebrowser.utils.config as config
 from qutebrowser.widgets.tabbar import TabWidget
 
+
 class TabbedBrowser(TabWidget):
     """A TabWidget with QWebViews inside"""
 
@@ -204,6 +205,7 @@ class TabbedBrowser(TabWidget):
                 round(100 * y / m[1]) if m[1] != 0 else 0)
         self.cur_scroll_perc_changed.emit(*perc)
 
+
 class BrowserTab(QWebView):
     """One browser tab in TabbedBrowser"""
     progress = 0

qutebrowser/widgets/completion.py

@@ -1,4 +1,3 @@
-import logging
 import html
 
 from PyQt5.QtWidgets import (QTreeView, QStyledItemDelegate, QStyle,
@@ -12,6 +11,7 @@ import qutebrowser.utils.config as config
 from qutebrowser.utils.completion import CompletionFilterModel
 from qutebrowser.commands.utils import CommandCompletionModel
 
+
 class CompletionView(QTreeView):
     _stylesheet = """
         QTreeView {{
@@ -72,7 +72,7 @@ class CompletionView(QTreeView):
     def resizeEvent(self, e):
         width = e.size().width()
         for i in range(self.model.columnCount()):
-            self.setColumnWidth(i, width/2)
+            self.setColumnWidth(i, width / 2)
         super().resizeEvent(e)
 
     def setmodel(self, model):
@@ -166,6 +166,7 @@ class CompletionView(QTreeView):
                 # Item is a real item, not a category header -> success
                 return idx
 
+
 class CompletionItemDelegate(QStyledItemDelegate):
     opt = None
     style = None
@@ -203,7 +204,6 @@ class CompletionItemDelegate(QStyledItemDelegate):
         self.opt.icon.paint(self.painter, icon_rect,
                             self.opt.decorationAlignment, mode, state)
 
-
     def _draw_text(self, index):
         if not self.opt.text:
             return

qutebrowser/widgets/mainwindow.py

@@ -4,6 +4,7 @@ from qutebrowser.widgets.statusbar import StatusBar
 from qutebrowser.widgets.browser import TabbedBrowser
 from qutebrowser.widgets.completion import CompletionView
 
+
 class MainWindow(QMainWindow):
     """The main window of QuteBrowser"""
     cwidget = None
@@ -47,4 +48,3 @@ class MainWindow(QMainWindow):
         #self.retranslateUi(MainWindow)
         #self.tabWidget.setCurrentIndex(0)
         #QtCore.QMetaObject.connectSlotsByName(MainWindow)
-

qutebrowser/widgets/statusbar/__init__.py

@@ -1,5 +1,3 @@
-import logging
-
 from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtWidgets import QHBoxLayout, QWidget
 
@@ -8,6 +6,7 @@ from qutebrowser.widgets.statusbar.command import Command
 from qutebrowser.widgets.statusbar.text import Text
 from qutebrowser.widgets.statusbar.progress import Progress
 
+
 class StatusBar(QWidget):
     """The statusbar at the bottom of the mainwindow"""
     hbox = None

qutebrowser/widgets/statusbar/command.py

@@ -4,12 +4,11 @@ from PyQt5.QtWidgets import QLineEdit, QShortcut
 from PyQt5.QtCore import pyqtSignal, Qt
 from PyQt5.QtGui import QValidator, QKeySequence
 
-from qutebrowser.commands.utils import CommandCompletionModel
 
 class Command(QLineEdit):
     """The commandline part of the statusbar"""
-
+    # Emitted when a command is triggered by the user
-    got_cmd = pyqtSignal(str) # Emitted when a command is triggered by the user
+    got_cmd = pyqtSignal(str)
     bar = None  # The status bar object
     esc_pressed = pyqtSignal()  # Emitted when escape is pressed
     tab_pressed = pyqtSignal(bool)  # Emitted when tab is pressed (arg: shift)
@@ -19,7 +18,8 @@ class Command(QLineEdit):
     _histpos = None
 
     # FIXME won't the tab key switch to the next widget?
-    # See http://www.saltycrane.com/blog/2008/01/how-to-capture-tab-key-press-event-with/
+    # See
+    # noqa http://www.saltycrane.com/blog/2008/01/how-to-capture-tab-key-press-event-with/
     # for a possible fix.
 
     def __init__(self, bar):
@@ -119,6 +119,7 @@ class Command(QLineEdit):
     def key_stab_handler(self):
         self.tab_pressed.emit(True)
 
+
 class Validator(QValidator):
     """Validator to prevent the : from getting deleted"""
     def validate(self, string, pos):
@@ -126,4 +127,3 @@ class Validator(QValidator):
             return (QValidator.Acceptable, string, pos)
         else:
             return (QValidator.Invalid, string, pos)
-

qutebrowser/widgets/statusbar/progress.py

@@ -3,6 +3,7 @@ import qutebrowser.utils.config as config
 from PyQt5.QtWidgets import QProgressBar, QSizePolicy
 from PyQt5.QtCore import QSize
 
+
 class Progress(QProgressBar):
     """ The progress bar part of the status bar"""
     bar = None
@@ -59,4 +60,3 @@ class Progress(QProgressBar):
             self.hide()
         else:
             self.color = config.colordict.getraw('statusbar.progress.bg.error')
-

qutebrowser/widgets/statusbar/text.py

@@ -1,6 +1,7 @@
 import logging
 from PyQt5.QtWidgets import QLabel
 
+
 class Text(QLabel):
     """The text part of the status bar, composed of several 'widgets'"""
     keystring = ''
@@ -37,4 +38,3 @@ class Text(QLabel):
         """Update the text displayed"""
         self.setText(' '.join([self.keystring, self.error, self.text,
                                self.scrollperc]))
-

qutebrowser/widgets/tabbar.py

@@ -3,6 +3,7 @@ from PyQt5.QtCore import Qt
 
 import qutebrowser.utils.config as config
 
+
 class TabWidget(QTabWidget):
     """The tabwidget used for TabbedBrowser"""