Remove unnecessary elses

This addresses no-else-return, which removes a `return` in an `else` after an
`if` that already has a `return`. This makes the default return more obvious in
most cases.

Author: agjohnson

readthedocs/bookmarks/views.py

@@ -175,30 +175,29 @@ def post(self, request, *args, **kwargs):
             bookmark = get_object_or_404(Bookmark, pk=kwargs['bookmark_pk'])
             bookmark.delete()
             return HttpResponseRedirect(reverse('bookmark_list'))
-        else:
-            try:
-                post_json = json.loads(request.body)
-                project = Project.objects.get(slug=post_json['project'])
-                version = project.versions.get(slug=post_json['version'])
-                url = post_json['url']
-                page = post_json['page']
-            except KeyError:
-                return HttpResponseBadRequest(
-                    json.dumps({'error': "Invalid parameters"})
-                )
-
-            bookmark = get_object_or_404(
-                Bookmark,
-                user=request.user,
-                url=url,
-                project=project,
-                version=version,
-                page=page
+        try:
+            post_json = json.loads(request.body)
+            project = Project.objects.get(slug=post_json['project'])
+            version = project.versions.get(slug=post_json['version'])
+            url = post_json['url']
+            page = post_json['page']
+        except KeyError:
+            return HttpResponseBadRequest(
+                json.dumps({'error': "Invalid parameters"})
             )
-            bookmark.delete()
 
-            return HttpResponse(
-                json.dumps({'removed': True}),
-                status=200,
-                content_type="application/json"
-            )
+        bookmark = get_object_or_404(
+            Bookmark,
+            user=request.user,
+            url=url,
+            project=project,
+            version=version,
+            page=page
+        )
+        bookmark.delete()
+
+        return HttpResponse(
+            json.dumps({'removed': True}),
+            status=200,
+            content_type="application/json"
+        )

readthedocs/builds/models.py

@@ -106,8 +106,7 @@ def commit_name(self):
         if self.slug == LATEST:
             if self.project.default_branch:
                 return self.project.default_branch
-            else:
-                return self.project.vcs_repo().fallback_branch
+            return self.project.vcs_repo().fallback_branch
 
         if self.slug == STABLE:
             if self.type == BRANCH:

readthedocs/comments/models.py

@@ -84,22 +84,20 @@ def latest_commit(self):
     def visible_comments(self):
         if not self.project.comment_moderation:
             return self.comments.all()
-        else:
-            # non-optimal SQL warning.
-            decisions = ModerationAction.objects.filter(
-                comment__node=self,
-                decision=1,
-                date__gt=self.snapshots.latest().date
-            )
-            valid_comments = self.comments.filter(moderation_actions__in=decisions).distinct()
-            return valid_comments
+        # non-optimal SQL warning.
+        decisions = ModerationAction.objects.filter(
+            comment__node=self,
+            decision=1,
+            date__gt=self.snapshots.latest().date
+        )
+        valid_comments = self.comments.filter(moderation_actions__in=decisions).distinct()
+        return valid_comments
 
     def update_hash(self, new_hash, commit):
         latest_snapshot = self.snapshots.latest()
         if latest_snapshot.hash == new_hash and latest_snapshot.commit == commit:
             return latest_snapshot
-        else:
-            return self.snapshots.create(hash=new_hash, commit=commit)
+        return self.snapshots.create(hash=new_hash, commit=commit)
 
 
 class DocumentNodeSerializer(serializers.ModelSerializer):
@@ -183,8 +181,7 @@ def has_been_approved_since_most_recent_node_change(self):
             # If we do have an approval action which is newer than the most recent change,
             # we'll return True or False commensurate with its "approved" attribute.
             return latest_moderation_action.approved()
-        else:
-            return False
+        return False
 
     def is_orphaned(self):
         raise NotImplementedError('TODO')

readthedocs/core/resolver.py

@@ -125,8 +125,7 @@ def resolve_domain(self, project, private=None):
             return domain.domain
         elif self._use_subdomain():
             return self._get_project_subdomain(canonical_project)
-        else:
-            return getattr(settings, 'PRODUCTION_DOMAIN')
+        return getattr(settings, 'PRODUCTION_DOMAIN')
 
     def resolve(self, project, protocol='http', filename='', private=None,
                 **kwargs):
@@ -155,8 +154,7 @@ def _get_canonical_project(self, project):
             return main_language_project
         elif relation:
             return relation.parent
-        else:
-            return project
+        return project
 
     def _get_project_subdomain(self, project):
         """Determine canonical project domain as subdomain"""

readthedocs/core/utils/__init__.py

@@ -33,9 +33,8 @@ def run_on_app_servers(command):
             if ret != 0:
                 ret_val = ret
         return ret_val
-    else:
-        ret = os.system(command)
-        return ret
+    ret = os.system(command)
+    return ret
 
 
 def broadcast(type, task, args):  # pylint: disable=redefined-builtin
@@ -56,8 +55,7 @@ def clean_url(url):
     parsed = urlparse(url)
     if parsed.scheme or parsed.netloc:
         return parsed.netloc
-    else:
-        return parsed.path
+    return parsed.path
 
 
 def cname_to_slug(host):

readthedocs/core/views/__init__.py

@@ -95,9 +95,8 @@ def wipe_version(request, project_slug, version_slug):
         for del_dir in del_dirs:
             broadcast(type='build', task=remove_dir, args=[del_dir])
         return redirect('project_version_list', project_slug)
-    else:
-        return render_to_response('wipe_version.html',
-                                  context_instance=RequestContext(request))
+    return render_to_response('wipe_version.html',
+                              context_instance=RequestContext(request))
 
 
 def divide_by_zero(request):  # pylint: disable=unused-argument

readthedocs/core/views/hooks.py

@@ -220,11 +220,9 @@ def gitlab_build(request):  # noqa: D205
         projects = get_project_from_url(search_url)
         if projects:
             return _build_url(search_url, projects, branches)
-        else:
-            log.error('Project match not found: url=%s', search_url)
-            return HttpResponseNotFound('Project match not found')
-    else:
-        return HttpResponse('Method not allowed, POST is required', status=405)
+        log.error('Project match not found: url=%s', search_url)
+        return HttpResponseNotFound('Project match not found')
+    return HttpResponse('Method not allowed, POST is required', status=405)
 
 
 @csrf_exempt
@@ -290,11 +288,9 @@ def bitbucket_build(request):
                 branches
             )
             return HttpResponseNotFound('Commit/branch not found')
-        else:
-            log.error('Project match not found: url=%s', search_url)
-            return HttpResponseNotFound('Project match not found')
-    else:
-        return HttpResponse('Method not allowed, POST is required', status=405)
+        log.error('Project match not found: url=%s', search_url)
+        return HttpResponseNotFound('Project match not found')
+    return HttpResponse('Method not allowed, POST is required', status=405)
 
 
 @csrf_exempt

readthedocs/doc_builder/config.py

@@ -29,25 +29,22 @@ def __init__(self, version, yaml_config):
     def pip_install(self):
         if 'pip_install' in self._yaml_config.get('python', {}):
             return self._yaml_config['python']['pip_install']
-        else:
-            return False
+        return False
 
     @property
     def install_project(self):
         if self.pip_install:
             return True
         if 'setup_py_install' in self._yaml_config.get('python', {}):
             return self._yaml_config['python']['setup_py_install']
-        else:
-            return self._project.install_project
+        return self._project.install_project
 
     @property
     def extra_requirements(self):
         if self.pip_install and 'extra_requirements' in self._yaml_config.get(
                 'python', {}):
             return self._yaml_config['python']['extra_requirements']
-        else:
-            return []
+        return []
 
     @property
     def python_interpreter(self):
@@ -77,8 +74,7 @@ def python_version(self):
     def use_system_site_packages(self):
         if 'use_system_site_packages' in self._yaml_config.get('python', {}):
             return self._yaml_config['python']['use_system_site_packages']
-        else:
-            return self._project.use_system_packages
+        return self._project.use_system_packages
 
     @property
     def use_conda(self):
@@ -88,27 +84,24 @@ def use_conda(self):
     def conda_file(self):
         if 'file' in self._yaml_config.get('conda', {}):
             return self._yaml_config['conda']['file']
-        else:
-            return None
+        return None
 
     @property
     def requirements_file(self):
         if 'requirements_file' in self._yaml_config:
             return self._yaml_config['requirements_file']
-        else:
-            return self._project.requirements_file
+        return self._project.requirements_file
 
     @property
     def formats(self):
         if 'formats' in self._yaml_config:
             return self._yaml_config['formats']
-        else:
-            formats = ['htmlzip']
-            if self._project.enable_epub_build:
-                formats += ['epub']
-            if self._project.enable_pdf_build:
-                formats += ['pdf']
-            return formats
+        formats = ['htmlzip']
+        if self._project.enable_epub_build:
+            formats += ['epub']
+        if self._project.enable_pdf_build:
+            formats += ['pdf']
+        return formats
 
     # Not implemented until we figure out how to keep in sync with the webs.
     # Probably needs to be version-specific as well, not project.

readthedocs/doc_builder/environments.py

@@ -165,8 +165,7 @@ def get_command(self):
         """Flatten command"""
         if hasattr(self.command, '__iter__') and not isinstance(self.command, str):
             return ' '.join(self.command)
-        else:
-            return self.command
+        return self.command
 
     def save(self):
         """Save this command and result via the API"""

readthedocs/oauth/utils.py

@@ -73,12 +73,11 @@ def update_webhook(project, integration, request=None):
         project.has_valid_webhook = True
         project.save()
         return True
-    else:
-        messages.error(
-            request,
-            _('Webhook activation failed. '
-              'Make sure you have the necessary permissions.')
-        )
-        project.has_valid_webhook = False
-        project.save()
-        return False
+    messages.error(
+        request,
+        _('Webhook activation failed. '
+            'Make sure you have the necessary permissions.')
+    )
+    project.has_valid_webhook = False
+    project.save()
+    return False

readthedocs/privacy/backend.py

@@ -38,29 +38,25 @@ def for_user_and_viewer(self, user, viewer):
     def for_admin_user(self, user=None):
         if user.is_authenticated():
             return self.filter(users__in=[user])
-        else:
-            return self.none()
+        return self.none()
 
     def public(self, user=None):
         queryset = self.filter(privacy_level=constants.PUBLIC)
         if user:
             return self._add_user_repos(queryset, user)
-        else:
-            return queryset
+        return queryset
 
     def protected(self, user=None):
         queryset = self.filter(privacy_level__in=[constants.PUBLIC, constants.PROTECTED])
         if user:
             return self._add_user_repos(queryset, user)
-        else:
-            return queryset
+        return queryset
 
     def private(self, user=None):
         queryset = self.filter(privacy_level=constants.PRIVATE)
         if user:
             return self._add_user_repos(queryset, user)
-        else:
-            return queryset
+        return queryset
 
     # Aliases
 

readthedocs/projects/models.py

@@ -357,8 +357,7 @@ def get_builds_url(self):
     def get_canonical_url(self):
         if getattr(settings, 'DONT_HIT_DB', True):
             return apiv2.project(self.pk).canonical_url().get()['url']
-        else:
-            return self.get_docs_url()
+        return self.get_docs_url()
 
     def get_subproject_urls(self):
         """List subproject URLs
@@ -371,9 +370,8 @@ def get_subproject_urls(self):
                         apiv2.project(self.pk)
                         .subprojects()
                         .get()['subprojects'])]
-        else:
-            return [(proj.child.slug, proj.child.get_docs_url())
-                    for proj in self.subprojects.all()]
+        return [(proj.child.slug, proj.child.get_docs_url())
+                for proj in self.subprojects.all()]
 
     def get_production_media_path(self, type_, version_slug, include_file=True):
         """
@@ -754,8 +752,7 @@ def get_default_branch(self):
         """Get the version representing 'latest'"""
         if self.default_branch:
             return self.default_branch
-        else:
-            return self.vcs_repo().fallback_branch
+        return self.vcs_repo().fallback_branch
 
     def add_subproject(self, child, alias=None):
         subproject, __ = ProjectRelationship.objects.get_or_create(

readthedocs/projects/version_handling.py

@@ -158,8 +158,7 @@ def highest_version(version_list):
     versions = sort_versions(version_list)
     if versions:
         return versions[0]
-    else:
-        return (None, None)
+    return (None, None)
 
 
 def determine_stable_version(version_list):
@@ -177,5 +176,4 @@ def determine_stable_version(version_list):
     if versions:
         version_obj, comparable = versions[0]
         return version_obj
-    else:
-        return None
+    return None

readthedocs/projects/views/public.py

@@ -246,8 +246,7 @@ def version_filter_autocomplete(request, project_slug):
             },
             context_instance=RequestContext(request),
         )
-    else:
-        return HttpResponse(status=400)
+    return HttpResponse(status=400)
 
 
 def file_autocomplete(request, project_slug):

readthedocs/redirects/models.py

@@ -80,8 +80,7 @@ def __unicode__(self):
             return ugettext('Page Redirect: %s -> %s' % (
                 self.from_url,
                 self.to_url))
-        else:
-            return ugettext('Redirect: %s' % self.get_redirect_type_display())
+        return ugettext('Redirect: %s' % self.get_redirect_type_display())
 
     def get_full_path(self, filename, language=None, version_slug=None):
         """