Merge branch 'master' of https://github.com/The-Compiler/qutebrowser into pintab

.flake8

@@ -23,18 +23,12 @@ exclude = .*,__pycache__,resources.py
 # D402: First line should not be function's signature (false-positives)
 # D403: First word of the first line should be properly capitalized
 #       (false-positives)
-# H101: Use TODO(NAME)
-# H201: bare except
-# H238: Use new-stule classes
-# H301: one import per line
-# H306: imports not in alphabetical order
 ignore =
     E128,E226,E265,E501,E402,E266,E731,
     F401,
     N802,
     P101,P102,P103,
-    D102,D103,D104,D105,D209,D211,D402,D403,
+    D102,D103,D104,D105,D209,D211,D402,D403
-    H101,H201,H238,H301,H306
 min-version = 3.4.0
 max-complexity = 12
 putty-auto-ignore = True

misc/requirements/requirements-flake8.txt

@@ -12,11 +12,8 @@ flake8-putty==0.4.0
 flake8-string-format==0.2.3
 flake8-tidy-imports==1.0.3
 flake8-tuple==0.2.12
-hacking==0.11.0
 mccabe==0.5.2
 packaging==16.8
-pbr==1.10.0
-pep8==1.7.0
 pep8-naming==0.4.1
 pycodestyle==2.1.0
 pydocstyle==1.1.1

misc/requirements/requirements-flake8.txt-raw

@@ -10,18 +10,14 @@ flake8-putty
 flake8-string-format
 flake8-tidy-imports
 flake8-tuple
-hacking
 pep8-naming
 pydocstyle
 pyflakes
 
-# Pinned to 1.5.7 by hacking otherwise
-pep8==1.7.0
-
 # Pinned to 2.0.0 otherwise
 pycodestyle==2.1.0
 
-# Waiting until hacking/flake8-tuple are updated
+# Waiting until flake8-putty updated
 #@ filter: flake8 < 3.0.0
 
 # https://github.com/JBKahn/flake8-debugger/issues/5

qutebrowser/html/no_pdfjs.html

@@ -90,6 +90,9 @@ li {
           <li>
             If you have installed a packaged version of qutebrowser, make sure
             the required packages for pdf.js are also installed.
+            <br/>
+            The package is named <b>pdfjs</b> on Archlinux (AUR) and
+            <b>libjs-pdf</b> on Debian.
           </li>
 
           <li>