jenkins-bot has submitted this change and it was merged.

Change subject: flake8-future-import 0.4.0 support ......................................................................

flake8-future-import 0.4.0 support

flake8-future-import 0.4.0 introduces two new codes FI16 and FI17 for future features nested_scopes and generators that are mandatory on Python 2.6, and thus have not been listed in each file.

These two can be deactivated by setting the flake8-future-import option min-version = 2.6. with_statement should also be deactivated by min-version = 2.6, however that doesnt appear to work.

Rather than forcing all devs to upgrade, also add the new codes to the ignore list.

Change-Id: I71a05cec2077ab07190c2286107ad70f475daa71 --- M tox.ini 1 file changed, 2 insertions(+), 1 deletion(-)

Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/tox.ini b/tox.ini index eb77d65..319e354 100644 --- a/tox.ini +++ b/tox.ini @@ -126,8 +126,9 @@ # E402: module level import not at top of file; see T87409 # H201: Except: format # P102,P103: string does contain unindexed parameters; see I36355923 -ignore = E402,D105,D211,FI10,FI12,FI13,FI15,FI5,H101,H201,H236,H301,H404,H405,I100,I101 +ignore = E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* +min-version = 2.6 max_line_length = 100 accept-encodings = utf-8 require-code = true