flake8 fixes

Minor style changes to make flake8 pass.

Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2013-05-05 11:52:40 -04:00
parent d05bcea552
commit 8040e7617b
12 changed files with 23 additions and 21 deletions

View File

@ -55,8 +55,8 @@ setup(
'stevedore.test.extension': [ 'stevedore.test.extension': [
't1 = stevedore.tests.test_extension:FauxExtension', 't1 = stevedore.tests.test_extension:FauxExtension',
't2 = stevedore.tests.test_extension:FauxExtension', 't2 = stevedore.tests.test_extension:FauxExtension',
], ],
}, },
zip_safe=False, zip_safe=False,
) )

View File

@ -1,3 +1,5 @@
# flake8: noqa
from .extension import ExtensionManager from .extension import ExtensionManager
from .enabled import EnabledExtensionManager from .enabled import EnabledExtensionManager
from .named import NamedExtensionManager from .named import NamedExtensionManager

View File

@ -95,7 +95,7 @@ class NameDispatchExtensionManager(DispatchExtensionManager):
invoke_on_load=invoke_on_load, invoke_on_load=invoke_on_load,
invoke_args=invoke_args, invoke_args=invoke_args,
invoke_kwds=invoke_kwds, invoke_kwds=invoke_kwds,
) )
self.by_name = dict((e.name, e) for e in self.extensions) self.by_name = dict((e.name, e) for e in self.extensions)
def map(self, names, func, *args, **kwds): def map(self, names, func, *args, **kwds):

View File

@ -29,7 +29,7 @@ class DriverManager(NamedExtensionManager):
invoke_on_load=invoke_on_load, invoke_on_load=invoke_on_load,
invoke_args=invoke_args, invoke_args=invoke_args,
invoke_kwds=invoke_kwds, invoke_kwds=invoke_kwds,
) )
if not self.extensions: if not self.extensions:
raise RuntimeError('No %r driver found, looking for %r' % raise RuntimeError('No %r driver found, looking for %r' %
(namespace, name)) (namespace, name))

View File

@ -38,12 +38,12 @@ class EnabledExtensionManager(ExtensionManager):
invoke_on_load=invoke_on_load, invoke_on_load=invoke_on_load,
invoke_args=invoke_args, invoke_args=invoke_args,
invoke_kwds=invoke_kwds, invoke_kwds=invoke_kwds,
) )
def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds): def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds):
ext = super(EnabledExtensionManager, self)._load_one_plugin( ext = super(EnabledExtensionManager, self)._load_one_plugin(
ep, invoke_on_load, invoke_args, invoke_kwds, ep, invoke_on_load, invoke_args, invoke_kwds,
) )
if ext and not self.check_func(ext): if ext and not self.check_func(ext):
LOG.debug('ignoring extension %r', ep.name) LOG.debug('ignoring extension %r', ep.name)
return None return None

View File

@ -29,4 +29,4 @@ class HookManager(NamedExtensionManager):
invoke_on_load=invoke_on_load, invoke_on_load=invoke_on_load,
invoke_args=invoke_args, invoke_args=invoke_args,
invoke_kwds=invoke_kwds, invoke_kwds=invoke_kwds,
) )

View File

@ -32,7 +32,7 @@ class NamedExtensionManager(ExtensionManager):
invoke_on_load=invoke_on_load, invoke_on_load=invoke_on_load,
invoke_args=invoke_args, invoke_args=invoke_args,
invoke_kwds=invoke_kwds, invoke_kwds=invoke_kwds,
) )
def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds): def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds):
# Check the name before going any further to prevent # Check the name before going any further to prevent
@ -42,4 +42,4 @@ class NamedExtensionManager(ExtensionManager):
return None return None
return super(NamedExtensionManager, self)._load_one_plugin( return super(NamedExtensionManager, self)._load_one_plugin(
ep, invoke_on_load, invoke_args, invoke_kwds, ep, invoke_on_load, invoke_args, invoke_kwds,
) )

View File

@ -15,7 +15,7 @@ def test_dispatch():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
assert len(em.extensions) == 2 assert len(em.extensions) == 2
assert set(em.names()) == set(['t1', 't2']) assert set(em.names()) == set(['t1', 't2'])
@ -39,7 +39,7 @@ def test_name_dispatch():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
assert len(em.extensions) == 2 assert len(em.extensions) == 2
assert set(em.names()) == set(['t1', 't2']) assert set(em.names()) == set(['t1', 't2'])

View File

@ -10,7 +10,7 @@ def test_enabled():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
assert len(em.extensions) == 1 assert len(em.extensions) == 1
assert em.names() == ['t2'] assert em.names() == ['t2']
@ -24,6 +24,6 @@ def test_enabled_after_load():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
assert len(em.extensions) == 1 assert len(em.extensions) == 1
assert em.names() == ['t2'] assert em.names() == ['t2']

View File

@ -8,6 +8,6 @@ def test_hook():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
assert len(em.extensions) == 1 assert len(em.extensions) == 1
assert em.names() == ['t1'] assert em.names() == ['t1']

View File

@ -10,7 +10,7 @@ def test_named():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
actual = em.names() actual = em.names()
assert actual == ['t1'] assert actual == ['t1']
@ -32,6 +32,6 @@ def test_enabled_before_load():
invoke_on_load=True, invoke_on_load=True,
invoke_args=('a',), invoke_args=('a',),
invoke_kwds={'b': 'B'}, invoke_kwds={'b': 'B'},
) )
actual = em.names() actual = em.names()
assert actual == [] assert actual == []

View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py26,py27,py32,py33,pep8 envlist = py26,py27,py32,py33,style
[testenv] [testenv]
commands = nosetests -d --with-coverage --cover-inclusive --cover-package stevedore [] commands = nosetests -d --with-coverage --cover-inclusive --cover-package stevedore []
@ -8,6 +8,6 @@ deps =
mock mock
coverage coverage
[testenv:pep8] [testenv:style]
deps = pep8 deps = flake8
commands = pep8 --repeat --ignore=E123 --show-source stevedore setup.py commands = flake8 stevedore setup.py