Update flake8 conf and fix linting errors.

A pep8 / pyflakes update surfaced a few linting errors.

mozillians/common/browserid_mock.py

@@ -25,13 +25,13 @@ def __init__(self, email=None):
             self.return_value = {'status': 'failure'}
 
     def __enter__(self):
-        for patch in self.settings_patches:
-            patch.start()
+        for settings_patch in self.settings_patches:
+            settings_patch.start()
         self.patcher.start().return_value = self.return_value
 
     def __exit__(self, exc_type, exc_value, traceback):
-        for patch in self.settings_patches:
-            patch.stop()
+        for settings_patch in self.settings_patches:
+            settings_patch.stop()
         self.patcher.stop()
 
     def __call__(self, func):

mozillians/groups/tests/test_views_misc.py

@@ -157,8 +157,8 @@ def test_basic_group_creation_as_non_manager(self):
             'irc_channel': u'some text, this is not validated',
             'website': u'http://mozillians.org',
             'wiki': u'http://wiki.mozillians.org',
-            #'members_can_leave': not checked
-            #'visible': not checked
+            # 'members_can_leave': not checked
+            # 'visible': not checked
             'functional_area': 'checked',  # should be ignored
             'accepting_new_members': 'yes',
             'members_can_leave': False,  # should be ignored

mozillians/users/api.py

@@ -146,7 +146,7 @@ def collapse_locations(obj_list, keyname):
     locations = locations.itervalues()
     # Now we have an iterable of dicts, but an iterable is not a queryset
     queryset = FakeQuerySet(locations)
-     # And let's make it a CustomQuerySet again
+    # And let's make it a CustomQuerySet again
     queryset = CustomQuerySet(queryset)
     return queryset
 

setup.cfg

@@ -1,4 +1,4 @@
 [flake8]
-ignore=E121,E123,E124,E125,E126
+ignore=E121,E123,E124,E125,E126,E129
 max-line-length=100
 exclude=migrations