From 1490b4e9288583ea84a80607997492591245a36a Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Thu, 8 Jun 2017 15:24:51 +0200
Subject: [PATCH] Flake8 the code.

---
 setup.cfg                                        | 2 +-
 src/Products/PythonScripts/PythonScript.py       | 6 ++----
 src/Products/PythonScripts/standard.py           | 1 +
 src/Products/PythonScripts/tests/testBindings.py | 1 +
 tox.ini                                          | 7 +++++++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d9aa824..6b93e92 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,5 +4,5 @@ ignore =
     bootstrap.py
 
 [flake8]
-ignore = N801,N802,N803,N805,N806,N812,E301
+ignore = E301
 exclude = bootstrap.py
diff --git a/src/Products/PythonScripts/PythonScript.py b/src/Products/PythonScripts/PythonScript.py
index fc764ec..0e52b44 100644
--- a/src/Products/PythonScripts/PythonScript.py
+++ b/src/Products/PythonScripts/PythonScript.py
@@ -20,10 +20,8 @@
 import marshal
 import os
 import re
-import six
 from six.moves.urllib.parse import quote
 import sys
-import traceback
 from types import FunctionType
 
 from AccessControl.class_init import InitializeClass
@@ -31,7 +29,6 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from AccessControl.ZopeGuards import get_safe_globals, guarded_getattr
-from AccessControl.ZopeGuards import get_safe_globals, guarded_getattr
 from Acquisition import aq_parent
 from App.Common import package_home
 from App.Dialogs import MessageDialog
@@ -175,7 +172,7 @@ def ZPythonScriptHTML_upload(self, REQUEST, file=''):
         if self.wl_isLocked():
             raise ResourceLockedError("The script is locked via WebDAV.")
 
-        if not instance(file, str):
+        if not isinstance(file, str):
             if not file:
                 raise ValueError('File not specified')
             file = file.read()
@@ -549,6 +546,7 @@ def document_src(self, REQUEST=None, RESPONSE=None):
             RESPONSE.setHeader('Content-Type', 'text/plain')
         return self.read()
 
+
 InitializeClass(PythonScript)
 
 
diff --git a/src/Products/PythonScripts/standard.py b/src/Products/PythonScripts/standard.py
index 88bea7b..6aaabb0 100644
--- a/src/Products/PythonScripts/standard.py
+++ b/src/Products/PythonScripts/standard.py
@@ -108,4 +108,5 @@ def __hash__(self):
 def Object(**kw):
     return _Object(**kw)
 
+
 security.apply(globals())
diff --git a/src/Products/PythonScripts/tests/testBindings.py b/src/Products/PythonScripts/tests/testBindings.py
index b889964..cd05ed0 100644
--- a/src/Products/PythonScripts/tests/testBindings.py
+++ b/src/Products/PythonScripts/tests/testBindings.py
@@ -94,6 +94,7 @@ def __repr__(self):
     def methodWithRoles(self):
         return 'method called'
 
+
 InitializeClass(FauxFolder)
 
 
diff --git a/tox.ini b/tox.ini
index 44b69bc..7b2bf5c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 envlist =
+   flake8,
    py27,
    py34,
    py35,
@@ -14,3 +15,9 @@ skip_install = true
 deps =
     setuptools==33.1.1
     zc.buildout
+
+[testenv:flake8]
+basepython = python2.7
+deps = flake8
+skip_install = true
+commands = flake8 --doctests src setup.py