From 80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Tue, 31 Oct 2017 10:57:43 +0100
Subject: bump flake8

closes #2601
---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b8e129ee..eaabfa12 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [flake8]
 max-line-length = 140
 max-complexity = 25
-ignore = E251,C901,W503,W292
+ignore = E251,C901,W503,W292,E722,E741
 exclude = mitmproxy/contrib/*,test/mitmproxy/data/*,release/build/*
 addons = file,open,basestring,xrange,unicode,long,cmp
 
diff --git a/setup.py b/setup.py
index 9c20cdc9..8e68e217 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(
             "pydivert>=2.0.3,<2.2",
         ],
         'dev': [
-            "flake8>=3.2.1, <3.5",
+            "flake8>=3.5, <3.6",
             "Flask>=0.10.1, <0.13",
             "mypy>=0.530,<0.541",
             "pytest-cov>=2.2.1, <3",
-- 
cgit v1.2.3