Test flake8 compatibility.

.travis.yml

@@ -8,10 +8,12 @@ python:
 install:
     - pip install -U setuptools==33.1.1
     - pip install zc.buildout
+    - pip install flake8
     - buildout bootstrap
     - buildout
 script:
     - bin/test -v1
+    - flake8 --doctests src setup.py
 notifications:
     email: false
 cache:

setup.cfg

@@ -4,7 +4,7 @@ ignore =
     bootstrap.py
 
 [flake8]
-ignore = N801,N802,N803,N805,N806,N812,E301
+ignore = N801,N802,N803,N805,N806,N812,E301,W503
 exclude = bootstrap.py
 
 [bdist_wheel]

setup.py

@@ -21,8 +21,9 @@
       description="A BTree based implementation for Zope 2's OFS.",
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
-      long_description=(open('README.rst').read() + '\n' +
-                        open('CHANGES.rst').read()),
+      long_description=(open('README.rst').read()
+                        + '\n'
+                        + open('CHANGES.rst').read()),
       packages=find_packages('src'),
       namespace_packages=['Products'],
       package_dir={'': 'src'},

src/Products/BTreeFolder2/BTreeFolder2.py

@@ -177,8 +177,8 @@ def _cleanup(self):
             check(self._mt_index)
             keys = set(self._tree.keys())
             for key, value in self._mt_index.items():
-                if (key not in self._mt_index or
-                        self._mt_index[key] is not value):
+                if (key not in self._mt_index
+                        or self._mt_index[key] is not value):
                     raise AssertionError(
                         "Missing or incorrect meta_type index: %s"
                         % repr(key))
@@ -205,7 +205,7 @@ def _cleanup(self):
                 new = len(keys)
                 if self._count() != new:
                     self._count.set(new)
-            except:
+            except Exception:
                 LOG.error('Failed to fix %s.' % path,
                           exc_info=sys.exc_info())
                 raise