Revert "Minor QWebSettings fix."

Happy April's fools!

This reverts commit a98060e020.

Conflicts:
	qutebrowser/app.py
	qutebrowser/misc/utilcmds.py

doc/help/commands.asciidoc

@@ -650,7 +650,6 @@ How many steps to zoom out.
 |<<completion-item-prev,completion-item-prev>>|Select the previous completion item.
 |<<enter-mode,enter-mode>>|Enter a key mode.
 |<<follow-hint,follow-hint>>|Follow the currently selected hint.
-|<<fooled,fooled>>|Turn off april's fools.
 |<<leave-mode,leave-mode>>|Leave the mode we're currently in.
 |<<open-editor,open-editor>>|Open an external editor with the currently selected form field.
 |<<prompt-accept,prompt-accept>>|Accept the current prompt.
@@ -708,10 +707,6 @@ Enter a key mode.
 === follow-hint
 Follow the currently selected hint.
 
-[[fooled]]
-=== fooled
-Turn off april's fools.
-
 [[leave-mode]]
 === leave-mode
 Leave the mode we're currently in.

qutebrowser/app.py

@@ -30,7 +30,6 @@ import base64
 import functools
 import traceback
 import faulthandler
-import datetime
 import json
 
 from PyQt5.QtWidgets import QApplication, QDialog, QMessageBox
@@ -162,15 +161,6 @@ class Application(QApplication):
         if self._crashdlg is not None:
             self._crashdlg.raise_()
 
-        state_config = objreg.get('state-config')
-        try:
-            fooled = state_config['general']['fooled']
-        except KeyError:
-            fooled = False
-        if datetime.date.today() == datetime.date(2015, 4, 1) and not fooled:
-            message.info('current', "Happy April's fools! Use :fooled to turn "
-                         "this off.")
-
     def __repr__(self):
         return utils.get_repr(self)
 

qutebrowser/config/websettings.py

@@ -24,12 +24,9 @@ Module attributes:
                 constants.
 """
 
-import base64
-import datetime
 import os.path
 
 from PyQt5.QtWebKit import QWebSettings
-from PyQt5.QtCore import QUrl
 
 from qutebrowser.config import config
 from qutebrowser.utils import standarddir, objreg, log, utils, debug
@@ -194,22 +191,6 @@ class Setter(Base):
         self._setter(*args)
 
 
-class AprilSetter(Setter):
-
-    """Set something... unless it's the 1st of April."""
-
-    def _set(self, value, qws=None):
-        state_config = objreg.get('state-config')
-        try:
-            fooled = state_config['general']['fooled']
-        except KeyError:
-            fooled = False
-        if datetime.date.today() == datetime.date(2015, 4, 1) and not fooled:
-            pass
-        else:
-            super()._set(value, qws)
-
-
 class NullStringSetter(Setter):
 
     """A setter for settings requiring a null QString as default.
@@ -336,8 +317,8 @@ MAPPINGS = {
         'frame-flattening':
             Attribute(QWebSettings.FrameFlatteningEnabled),
         'user-stylesheet':
-            AprilSetter(getter=QWebSettings.userStyleSheetUrl,
+            Setter(getter=QWebSettings.userStyleSheetUrl,
-                        setter=QWebSettings.setUserStyleSheetUrl),
+                   setter=QWebSettings.setUserStyleSheetUrl),
         'css-media-type':
             NullStringSetter(getter=QWebSettings.cssMediaType,
                              setter=QWebSettings.setCSSMediaType),
@@ -399,21 +380,6 @@ def init():
     QWebSettings.setOfflineStoragePath(
         os.path.join(standarddir.data(), 'offline-storage'))
 
-    state_config = objreg.get('state-config')
-    try:
-        fooled = state_config['general']['fooled']
-    except KeyError:
-        fooled = False
-    if datetime.date.today() == datetime.date(2015, 4, 1) and not fooled:
-        value = """
-            html {
-                -webkit-transform:rotate(3deg) scale(0.99);
-            }
-        """
-        data = base64.b64encode(value.encode('utf-8')).decode('ascii')
-        url = QUrl("data:text/css;charset=utf-8;base64,{}".format(data))
-        QWebSettings.globalSettings().setUserStyleSheetUrl(url)
-
     for sectname, section in MAPPINGS.items():
         for optname, mapping in section.items():
             default = mapping.save_default()

qutebrowser/misc/utilcmds.py

@@ -136,12 +136,3 @@ def debug_trace(expr=""):
         eval('hunter.trace({})'.format(expr))
     except Exception as e:
         raise cmdexc.CommandError("{}: {}".format(e.__class__.__name__, e))
-
-
-@cmdutils.register(hide=True)
-def fooled():
-    """Turn off april's fools."""
-    from qutebrowser.config import websettings
-    state_config = objreg.get('state-config')
-    state_config['general']['fooled'] = '1'
-    websettings.update_settings('ui', 'user-stylesheet')