Make a pass w/ python-modernize.

Author: gthank

readthedocs/api/base.py

@@ -1,4 +1,5 @@
 """API resources"""
+from __future__ import absolute_import
 import logging
 import json
 import redis

readthedocs/api/client.py

@@ -1,4 +1,5 @@
 """Slumber API client"""
+from __future__ import absolute_import
 import logging
 
 from slumber import API

readthedocs/api/utils.py

@@ -1,4 +1,5 @@
 """Utility classes for api module"""
+from __future__ import absolute_import
 import logging
 
 from django.core.paginator import Paginator, InvalidPage

readthedocs/bookmarks/admin.py

@@ -1,5 +1,6 @@
 """Django admin interface for `~bookmarks.models.Bookmark`."""
 
+from __future__ import absolute_import
 from django.contrib import admin
 from readthedocs.bookmarks.models import Bookmark
 

readthedocs/bookmarks/migrations/0001_initial.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from __future__ import absolute_import
 from django.db import models, migrations
 from django.conf import settings
 

readthedocs/bookmarks/models.py

@@ -1,5 +1,6 @@
 """Models for the bookmarks app."""
 
+from __future__ import absolute_import
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _, ugettext

readthedocs/bookmarks/urls.py

@@ -1,5 +1,6 @@
 """URL config for the bookmarks app."""
 
+from __future__ import absolute_import
 from django.conf.urls import url
 from readthedocs.bookmarks.views import BookmarkListView
 from readthedocs.bookmarks.views import BookmarkAddView, BookmarkRemoveView

readthedocs/bookmarks/views.py

@@ -1,5 +1,6 @@
 """Views for the bookmarks app."""
 
+from __future__ import absolute_import
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
 from django.http import HttpResponseBadRequest

readthedocs/builds/admin.py

@@ -1,5 +1,6 @@
 """Django admin interface for `~builds.models.Build` and related models."""
 
+from __future__ import absolute_import
 from django.contrib import admin
 from readthedocs.builds.models import Build, VersionAlias, Version, BuildCommandResult
 from guardian.admin import GuardedModelAdmin

readthedocs/builds/constants.py

@@ -1,5 +1,6 @@
 """Constants for the builds app."""
 
+from __future__ import absolute_import
 from django.utils.translation import ugettext_lazy as _
 
 BUILD_STATE_TRIGGERED = 'triggered'

readthedocs/builds/forms.py

@@ -1,5 +1,6 @@
 """Django forms for the builds app."""
 
+from __future__ import absolute_import
 from django import forms
 
 from readthedocs.builds.models import VersionAlias, Version

readthedocs/builds/migrations/0001_initial.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from __future__ import absolute_import
 from django.db import models, migrations
 import readthedocs.builds.version_slug
 import taggit.managers

readthedocs/builds/migrations/0002_build_command_initial.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from __future__ import absolute_import
 from django.db import models, migrations
 import readthedocs.builds.models
 

readthedocs/builds/models.py

@@ -1,5 +1,6 @@
 """Models for the builds app."""
 
+from __future__ import absolute_import
 import logging
 import re
 import os.path

readthedocs/builds/signals.py

@@ -1,5 +1,6 @@
 """Build signals"""
 
+from __future__ import absolute_import
 import django.dispatch
 
 

readthedocs/builds/urls.py

@@ -1,5 +1,6 @@
 """URL configuration for builds app."""
 
+from __future__ import absolute_import
 from django.conf.urls import url
 
 from .views import builds_redirect_detail, builds_redirect_list

readthedocs/builds/utils.py

@@ -1,5 +1,6 @@
 """Utilities for the builds app."""
 
+from __future__ import absolute_import
 import re
 
 

readthedocs/builds/version_slug.py

@@ -16,12 +16,14 @@
 another number would be confusing.
 """
 
+from __future__ import absolute_import
 import math
 import re
 import string
 from operator import truediv
 from django.db import models
 from django.utils.encoding import force_text
+from six.moves import range
 
 
 # Regex breakdown:
@@ -97,7 +99,7 @@ def uniquifying_suffix(self, iteration):
             power = int(math.log(iteration, length))
         current = iteration
         suffix = ''
-        for exp in reversed(range(0, power + 1)):
+        for exp in reversed(list(range(0, power + 1))):
             digit = int(truediv(current, length ** exp))
             suffix += alphabet[digit]
             current = current % length ** exp

readthedocs/builds/views.py

@@ -1,5 +1,6 @@
 """Views for builds app."""
 
+from __future__ import absolute_import
 import logging
 
 from django.shortcuts import get_object_or_404

readthedocs/cdn/purge.py

@@ -1,8 +1,10 @@
 """Utility to purge MaxCDN files, if configured."""
 
+from __future__ import absolute_import
 import logging
 
 from django.conf import settings
+from six.moves import range
 
 log = logging.getLogger(__name__)
 
@@ -14,7 +16,7 @@
 
 def chunks(in_list, chunk_size):
     """Yield successive n-sized chunks from l."""
-    for i in xrange(0, len(in_list), chunk_size):
+    for i in range(0, len(in_list), chunk_size):
         yield in_list[i:i + chunk_size]
 
 if CDN_USERNAME and CDN_KEY and CDN_SECRET and CDN_SERVICE == 'maxcdn':

readthedocs/comments/admin.py

@@ -1,5 +1,6 @@
 """ModelAdmin configurations for comments app."""
 
+from __future__ import absolute_import
 from django.contrib import admin
 from .models import DocumentNode, DocumentComment, NodeSnapshot
 

readthedocs/comments/backend.py

@@ -1,5 +1,6 @@
 """Storage backends for the comments app."""
 
+from __future__ import absolute_import
 import json
 
 from django.core import serializers

readthedocs/comments/migrations/0001_initial.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from __future__ import absolute_import
 from django.db import models, migrations
 from django.conf import settings
 

readthedocs/comments/models.py

@@ -1,5 +1,6 @@
 """Models for the comments app."""
 
+from __future__ import absolute_import
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import ugettext_lazy as _

readthedocs/comments/session.py

@@ -1,5 +1,6 @@
 """Authentication backends for DRF."""
 
+from __future__ import absolute_import
 from rest_framework.authentication import SessionAuthentication
 
 

readthedocs/comments/tests.py

@@ -5,6 +5,7 @@
 Replace this with more appropriate tests for your application.
 """
 
+from __future__ import absolute_import
 from django.test import TestCase
 
 

readthedocs/comments/urls.py

@@ -1,5 +1,6 @@
 """URL configuration for comments app."""
 
+from __future__ import absolute_import
 from django.conf.urls import url
 
 from readthedocs.comments import views

readthedocs/comments/views.py

@@ -1,5 +1,6 @@
 """Views for comments app."""
 
+from __future__ import absolute_import
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render_to_response
 from django.template import RequestContext

readthedocs/constants.py

@@ -1,5 +1,6 @@
 """Common constants"""
 
+from __future__ import absolute_import
 from readthedocs.builds.version_slug import VERSION_SLUG_REGEX
 from readthedocs.projects.constants import LANGUAGES_REGEX, PROJECT_SLUG_REGEX
 

readthedocs/core/adapters.py

@@ -1,5 +1,6 @@
 """Allauth overrides"""
 
+from __future__ import absolute_import
 import pickle
 import logging
 

readthedocs/core/admin.py

@@ -1,5 +1,6 @@
 """Django admin interface for core models"""
 
+from __future__ import absolute_import
 from datetime import datetime, timedelta
 
 from django.contrib import admin

readthedocs/core/apps.py

@@ -1,5 +1,6 @@
 """App configurations for core app."""
 
+from __future__ import absolute_import
 from django.apps import AppConfig
 
 

readthedocs/core/backends.py

@@ -1,5 +1,6 @@
 """Email backends for core app."""
 
+from __future__ import absolute_import
 import smtplib
 
 from django.core.mail.utils import DNS_NAME

readthedocs/core/context_processors.py

@@ -1,5 +1,6 @@
 """Template context processors for core app."""
 
+from __future__ import absolute_import
 from django.conf import settings
 
 

readthedocs/core/fields.py

@@ -1,5 +1,6 @@
 """Shared model fields and defaults"""
 
+from __future__ import absolute_import
 import binascii
 import os
 

readthedocs/core/forms.py

@@ -1,5 +1,6 @@
 """Forms for core app."""
 
+from __future__ import absolute_import
 import logging
 
 from haystack.forms import SearchForm

readthedocs/core/management/commands/archive.py

@@ -1,5 +1,7 @@
 """Rebuild documentation for all projects"""
 
+from __future__ import absolute_import
+from __future__ import print_function
 from glob import glob
 import os
 import logging
@@ -31,4 +33,4 @@ def handle(self, *args, **options):
             'MEDIA_URL': settings.MEDIA_URL,
         }
         html = template_loader.get_template('archive/index.html').render(context)
-        print html
+        print(html)

readthedocs/core/management/commands/clean_builds.py

@@ -1,5 +1,6 @@
 """Clean up stable build paths per project version"""
 
+from __future__ import absolute_import
 from datetime import datetime, timedelta
 import logging
 from optparse import make_option

readthedocs/core/management/commands/import_github.py

@@ -1,5 +1,6 @@
 """Resync GitHub project for user"""
 
+from __future__ import absolute_import
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 

readthedocs/core/management/commands/import_github_language.py

@@ -8,6 +8,8 @@
 which should contain a proper GitHub Oauth Token for rate limiting.
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import os
 import requests
 
@@ -31,7 +33,7 @@ def handle(self, *args, **options):
         # pylint: disable=too-many-locals
         token = os.environ.get('GITHUB_AUTH_TOKEN')
         if not token:
-            print 'Invalid GitHub token, exiting'
+            print('Invalid GitHub token, exiting')
             return
 
         for project in Project.objects.filter(
@@ -48,7 +50,7 @@ def handle(self, *args, **options):
                     break
 
             if not user:
-                print 'No GitHub repo for %s' % repo_url
+                print('No GitHub repo for %s' % repo_url)
                 continue
 
             cache_key = '%s-%s' % (user, repo)
@@ -64,15 +66,15 @@ def handle(self, *args, **options):
                 languages = resp.json()
                 if not languages:
                     continue
-                sorted_langs = sorted(languages.items(), key=lambda x: x[1], reverse=True)
-                print 'Sorted langs: %s ' % sorted_langs
+                sorted_langs = sorted(list(languages.items()), key=lambda x: x[1], reverse=True)
+                print('Sorted langs: %s ' % sorted_langs)
                 top_lang = sorted_langs[0][0]
             else:
-                print 'Cached top_lang: %s' % top_lang
+                print('Cached top_lang: %s' % top_lang)
             if top_lang in PL_DICT:
                 slug = PL_DICT[top_lang]
-                print 'Setting %s to %s' % (repo_url, slug)
+                print('Setting %s to %s' % (repo_url, slug))
                 Project.objects.filter(pk=project.pk).update(programming_language=slug)
             else:
-                print 'Language unknown: %s' % top_lang
+                print('Language unknown: %s' % top_lang)
             cache.set(cache_key, top_lang, 60 * 600)

readthedocs/core/management/commands/pull.py

@@ -1,5 +1,6 @@
 """Trigger build for project slug"""
 
+from __future__ import absolute_import
 import logging
 
 from django.core.management.base import BaseCommand

readthedocs/core/management/commands/reindex_elasticsearch.py

@@ -1,5 +1,6 @@
 """Reindex Elastic Search indexes"""
 
+from __future__ import absolute_import
 import logging
 from optparse import make_option
 

readthedocs/core/management/commands/set_metadata.py

@@ -1,5 +1,6 @@
 """Generate metadata for all projects"""
 
+from __future__ import absolute_import
 import logging
 
 from django.core.management.base import BaseCommand

readthedocs/core/management/commands/symlink.py

@@ -1,5 +1,6 @@
 """Update symlinks for projects"""
 
+from __future__ import absolute_import
 import logging
 
 from django.core.management.base import BaseCommand

readthedocs/core/management/commands/update_api.py

@@ -6,6 +6,7 @@
     ./manage.py update_api <slug>
 """
 
+from __future__ import absolute_import
 import logging
 
 from django.core.management.base import BaseCommand