Precommit

Author: stsewd

readthedocs/core/resolver.py

@@ -1,11 +1,9 @@
+# -*- coding: utf-8 -*-
 """URL resolver for documentation."""
 
-from __future__ import absolute_import
-
 import re
 from urllib.parse import urlunparse
 
-from builtins import object
 from django.conf import settings
 
 from readthedocs.core.utils.extend import SettingsOverrideObject
@@ -53,9 +51,11 @@ class ResolverBase(object):
         /docs/<project_slug>/projects/<subproject_slug>/<filename>
     """
 
-    def base_resolve_path(self, project_slug, filename, version_slug=None,
-                          language=None, private=False, single_version=None,
-                          subproject_slug=None, subdomain=None, cname=None):
+    def base_resolve_path(
+            self, project_slug, filename, version_slug=None, language=None,
+            private=False, single_version=None, subproject_slug=None,
+            subdomain=None, cname=None
+    ):
         """Resolve a with nothing smart, just filling in the blanks."""
         # Only support `/docs/project' URLs outside our normal environment. Normally
         # the path should always have a subdomain or CNAME domain
@@ -74,14 +74,18 @@ def base_resolve_path(self, project_slug, filename, version_slug=None,
             url += u'{language}/{version_slug}/{filename}'
 
         return url.format(
-            project_slug=project_slug, filename=filename,
-            version_slug=version_slug, language=language,
-            single_version=single_version, subproject_slug=subproject_slug,
+            project_slug=project_slug,
+            filename=filename,
+            version_slug=version_slug,
+            language=language,
+            single_version=single_version,
+            subproject_slug=subproject_slug,
         )
 
-    def resolve_path(self, project, filename='', version_slug=None,
-                     language=None, single_version=None, subdomain=None,
-                     cname=None, private=None):
+    def resolve_path(
+            self, project, filename='', version_slug=None, language=None,
+            single_version=None, subdomain=None, cname=None, private=None
+    ):
         """Resolve a URL with a subset of fields defined."""
         cname = cname or project.domains.filter(canonical=True).first()
         version_slug = version_slug or project.get_default_version()
@@ -140,8 +144,10 @@ def resolve_domain(self, project, private=None):
 
         return getattr(settings, 'PRODUCTION_DOMAIN')
 
-    def resolve(self, project, require_https=False, filename='',
-                query_params='', private=None, **kwargs):
+    def resolve(
+            self, project, require_https=False, filename='', query_params='',
+            private=None, **kwargs
+    ):
         if private is None:
             version_slug = kwargs.get('version_slug')
             if version_slug is None:
@@ -212,7 +218,7 @@ def _get_project_subdomain(self, project):
         if self._use_subdomain():
             project = self._get_canonical_project(project)
             subdomain_slug = project.slug.replace('_', '-')
-            return "%s.%s" % (subdomain_slug, public_domain)
+            return '%s.%s' % (subdomain_slug, public_domain)
 
     def _get_project_custom_domain(self, project):
         return project.domains.filter(canonical=True).first()
@@ -223,7 +229,9 @@ def _get_private(self, project, version_slug):
             version = project.versions.get(slug=version_slug)
             private = version.privacy_level == PRIVATE
         except Version.DoesNotExist:
-            private = getattr(settings, 'DEFAULT_PRIVACY_LEVEL', PUBLIC) == PRIVATE
+            private = getattr(
+                settings, 'DEFAULT_PRIVACY_LEVEL', PUBLIC
+            ) == PRIVATE
         return private
 
     def _fix_filename(self, project, filename):
@@ -241,17 +249,17 @@ def _fix_filename(self, project, filename):
         if filename:
             if filename.endswith('/') or filename.endswith('.html'):
                 path = filename
-            elif project.documentation_type == "sphinx_singlehtml":
-                path = "index.html#document-" + filename
-            elif project.documentation_type in ["sphinx_htmldir", "mkdocs"]:
-                path = filename + "/"
+            elif project.documentation_type == 'sphinx_singlehtml':
+                path = 'index.html#document-' + filename
+            elif project.documentation_type in ['sphinx_htmldir', 'mkdocs']:
+                path = filename + '/'
             elif '#' in filename:
                 # do nothing if the filename contains URL fragments
                 path = filename
             else:
-                path = filename + ".html"
+                path = filename + '.html'
         else:
-            path = ""
+            path = ''
         return path
 
     def _use_custom_domain(self, custom_domain):

readthedocs/core/views/serve.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 Doc serving from Python.
 
@@ -25,13 +26,6 @@
 SERVE_DOCS (['private']) - The list of ['private', 'public'] docs to serve.
 """
 
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals,
-)
-
 import logging
 import mimetypes
 import os
@@ -63,8 +57,11 @@ def map_subproject_slug(view_func):
 
     .. warning:: Does not take into account any kind of privacy settings.
     """
+
     @wraps(view_func)
-    def inner_view(request, subproject=None, subproject_slug=None, *args, **kwargs):  # noqa
+    def inner_view(
+            request, subproject=None, subproject_slug=None, *args, **kwargs
+    ):  # noqa
         if subproject is None and subproject_slug:
             # Try to fetch by subproject alias first, otherwise we might end up
             # redirected to an unrelated project.
@@ -90,8 +87,11 @@ def map_project_slug(view_func):
 
     .. warning:: Does not take into account any kind of privacy settings.
     """
+
     @wraps(view_func)
-    def inner_view(request, project=None, project_slug=None, *args, **kwargs):  # noqa
+    def inner_view(
+            request, project=None, project_slug=None, *args, **kwargs
+    ):  # noqa
         if project is None:
             if not project_slug:
                 project_slug = request.slug
@@ -109,22 +109,26 @@ def inner_view(request, project=None, project_slug=None, *args, **kwargs):  # no
 def redirect_project_slug(request, project, subproject):  # pylint: disable=unused-argument
     """Handle / -> /en/latest/ directs on subdomains."""
     urlparse_result = urlparse(request.get_full_path())
-    return HttpResponseRedirect(resolve(
-        subproject or project,
-        query_params=urlparse_result.query,
-    ))
+    return HttpResponseRedirect(
+        resolve(
+            subproject or project,
+            query_params=urlparse_result.query,
+        )
+    )
 
 
 @map_project_slug
 @map_subproject_slug
 def redirect_page_with_filename(request, project, subproject, filename):  # pylint: disable=unused-argument  # noqa
     """Redirect /page/file.html to /en/latest/file.html."""
     urlparse_result = urlparse(request.get_full_path())
-    return HttpResponseRedirect(resolve(
-        subproject or project,
-        filename=filename,
-        query_params=urlparse_result.query,
-    ))
+    return HttpResponseRedirect(
+        resolve(
+            subproject or project,
+            filename=filename,
+            query_params=urlparse_result.query,
+        )
+    )
 
 
 def _serve_401(request, project):
@@ -142,7 +146,8 @@ def _serve_file(request, filename, basepath):
 
     # Serve from Nginx
     content_type, encoding = mimetypes.guess_type(
-        os.path.join(basepath, filename))
+        os.path.join(basepath, filename)
+    )
     content_type = content_type or 'application/octet-stream'
     response = HttpResponse(content_type=content_type)
     if encoding:
@@ -169,8 +174,10 @@ def _serve_file(request, filename, basepath):
 @map_subproject_slug
 def serve_docs(
         request, project, subproject, lang_slug=None, version_slug=None,
-        filename=''):
-    """Exists to map existing proj, lang, version, filename views to the file format."""
+        filename=''
+):
+    """Exists to map existing proj, lang, version, filename views to the file
+    format."""
     if not version_slug:
         version_slug = project.get_default_version()
     try:
@@ -235,4 +242,5 @@ def _serve_symlink_docs(request, project, privacy_level, filename=''):
         files_tried.append(os.path.join(basepath, filename))
 
     raise Http404(
-        'File not found. Tried these files: %s' % ','.join(files_tried))
+        'File not found. Tried these files: %s' % ','.join(files_tried)
+    )

readthedocs/redirects/managers.py

@@ -1,15 +1,17 @@
+# -*- coding: utf-8 -*-
 """Manager and queryset for the redirects app."""
 
-from __future__ import absolute_import
 from django.db.models import Manager
 from django.db.models.query import QuerySet
 
 
 class RedirectQuerySet(QuerySet):
+
     def get_redirect_path(self, path, language=None, version_slug=None):
         for redirect in self.select_related('project'):
             new_path = redirect.get_redirect_path(
-                path=path, language=language, version_slug=version_slug)
+                path=path, language=language, version_slug=version_slug
+            )
             if new_path:
                 return new_path
         return None

readthedocs/redirects/utils.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Redirection view support.
 
@@ -7,8 +8,6 @@
 These are not used directly as views; they are instead included into 404
 handlers, so that redirects only take effect if no other view matches.
 """
-from __future__ import absolute_import
-
 import logging
 import re
 from urllib.parse import urlparse, urlunparse
@@ -38,9 +37,7 @@ def project_and_path_from_request(request, path):
     elif path.startswith('/docs/'):
         # In this case we use the docs without subdomains. So let's strip the
         # docs prefix.
-        match = re.match(
-            r'^/docs/(?P<project_slug>[^/]+)(?P<path>/.*)$',
-            path)
+        match = re.match(r'^/docs/(?P<project_slug>[^/]+)(?P<path>/.*)$', path)
         if match:
             project_slug = match.groupdict()['project_slug']
             path = match.groupdict()['path']
@@ -59,7 +56,8 @@ def project_and_path_from_request(request, path):
 def language_and_version_from_path(path):
     match = re.match(
         r'^/(?P<language>%s)/(?P<version_slug>[^/]+)(?P<path>/.*)$' % LANGUAGES_REGEX,
-        path)
+        path
+    )
     if match:
         language = match.groupdict()['language']
         version_slug = match.groupdict()['version_slug']
@@ -77,9 +75,7 @@ def get_redirect_response(request, full_path):
     version_slug = None
     schema, netloc, path, params, query, fragments = urlparse(full_path)
     if not project.single_version:
-        language, version_slug, path = language_and_version_from_path(
-            path
-        )
+        language, version_slug, path = language_and_version_from_path(path)
 
     path = project.redirects.get_redirect_path(
         path=path, language=language, version_slug=version_slug