diff options
| author | Florian Bruhin <git@the-compiler.org> | 2014-09-22 19:09:48 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2014-09-22 19:09:48 +0200 |
| commit | 812a0fdd412e6493035870009c2152d756bd7251 (patch) | |
| tree | 4e7b9f7bcf91d104c31e82fbb21b83becd41ad32 /.flake8 | |
| parent | 53b617590f7bad6cf622d788e9b286850d18ab13 (diff) | |
| parent | cb53432969f14c110183a94c40d93056d6e0930d (diff) | |
| download | qutebrowser-812a0fdd412e6493035870009c2152d756bd7251.tar.gz qutebrowser-812a0fdd412e6493035870009c2152d756bd7251.zip | |
Merge branch 'newcmd'
Conflicts:
.flake8
pkg/PKGBUILD.qutebrowser-git
qutebrowser/browser/commands.py
qutebrowser/browser/hints.py
qutebrowser/config/configdata.py
qutebrowser/network/qutescheme.py
qutebrowser/test/config/test_configtypes.py
qutebrowser/utils/utils.py
Diffstat (limited to '.flake8')
| -rw-r--r-- | .flake8 | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -11,8 +11,9 @@ # E222: Multiple spaces after operator # F811: Redifiniton # W292: No newline at end of file +# E701: multiple statements on one line # E702: multiple statements on one line # E225: missing whitespace around operator -ignore=E241,E265,F401,E501,F821,F841,E222,F811,W292,E702,E225 +ignore=E241,E265,F401,E501,F821,F841,E222,F811,W292,E701,E702,E225 max_complexity = 12 exclude = ez_setup.py |