Fix lint errors for oauth app (readthedocs#2869)

Author: lordmauve

prospector-more.yml

@@ -13,7 +13,6 @@ ignore-paths:
   - donate/
   - gold/
   - notifications/
-  - oauth/
   - payments/
   - privacy/
   - profiles/

readthedocs/oauth/admin.py

@@ -1,13 +1,21 @@
+"""Admin configuration for the OAuth app."""
+
 from django.contrib import admin
 
 from .models import RemoteRepository, RemoteOrganization
 
 
 class RemoteRepositoryAdmin(admin.ModelAdmin):
+
+    """Admin configuration for the RemoteRepository model."""
+
     raw_id_fields = ('users',)
 
 
 class RemoteOrganizationAdmin(admin.ModelAdmin):
+
+    """Admin configuration for the RemoteOrganization model."""
+
     raw_id_fields = ('users',)
 
 

readthedocs/oauth/services/bitbucket.py

@@ -107,7 +107,7 @@ def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
                 account=self.account,
             )
             if repo.organization and repo.organization != organization:
-                log.debug('Not importing %s because mismatched orgs' %
+                log.debug('Not importing %s because mismatched orgs',
                           fields['name'])
                 return None
             else:
@@ -139,7 +139,7 @@ def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
             repo.save()
             return repo
         else:
-            log.debug('Not importing %s because mismatched type' %
+            log.debug('Not importing %s because mismatched type',
                       fields['name'])
 
     def create_organization(self, fields):

readthedocs/oauth/services/github.py

@@ -94,7 +94,7 @@ def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
                 )
                 repo.users.add(self.user)
             if repo.organization and repo.organization != organization:
-                log.debug('Not importing %s because mismatched orgs' %
+                log.debug('Not importing %s because mismatched orgs',
                           fields['name'])
                 return None
             else:
@@ -116,7 +116,7 @@ def create_repository(self, fields, privacy=DEFAULT_PRIVACY_LEVEL,
             repo.save()
             return repo
         else:
-            log.debug('Not importing %s because mismatched type' %
+            log.debug('Not importing %s because mismatched type',
                       fields['name'])
 
     def create_organization(self, fields):
@@ -214,7 +214,6 @@ def setup_webhook(self, project):
         except (RequestException, ValueError):
             log.error('GitHub webhook creation failed for project: %s',
                       project, exc_info=True)
-            pass
         else:
             log.error('GitHub webhook creation failed for project: %s',
                       project)
@@ -224,7 +223,7 @@ def setup_webhook(self, project):
             except ValueError:
                 debug_data = resp.content
             log.debug('GitHub webhook creation failure response: %s',
-                      resp.json())
+                      debug_data)
             return (False, resp)
 
     def update_webhook(self, project, integration):
@@ -259,15 +258,15 @@ def update_webhook(self, project, integration):
         except (RequestException, ValueError):
             log.error('GitHub webhook update failed for project: %s',
                       project, exc_info=True)
-            pass
         else:
             log.error('GitHub webhook update failed for project: %s',
                       project)
             try:
-                log.debug('GitHub webhook creation failure response: %s',
-                          resp.json())
+                debug_data = resp.json()
             except ValueError:
-                pass
+                debug_data = resp.content
+            log.debug('GitHub webhook creation failure response: %s',
+                      debug_data)
             return (False, resp)
 
     @classmethod

readthedocs/oauth/utils.py

@@ -1,3 +1,4 @@
+"""Support code for OAuth, including webhook support."""
 import logging
 
 from django.contrib import messages
@@ -36,7 +37,7 @@ def attach_webhook(project, request=None):
 
     user_accounts = service.for_user(request.user)
     for account in user_accounts:
-        success, resp = account.setup_webhook(project)
+        success, __ = account.setup_webhook(project)
         if success:
             messages.success(request, _('Webhook activated'))
             project.has_valid_webhook = True