Merge branch 'master' of https://github.com/gthank/readthedocs.org into gthank-master

Author: ericholscher

.gitignore

@@ -40,3 +40,4 @@ public_*
 private_*
 .rope_project/
 readthedocs/htmlcov
+tags

.travis.yml

@@ -1,9 +1,10 @@
 language: python
 python:
- - 2.7
+ - 3.6
 sudo: false
 env:
  - TOX_ENV=py27
+ - TOX_ENV=py36
  - TOX_ENV=docs
  - TOX_ENV=lint
  - TOX_ENV=eslint

readthedocs/api/base.py

@@ -1,4 +1,6 @@
 """API resources"""
+from __future__ import absolute_import
+from builtins import object
 import logging
 import json
 import redis
@@ -95,7 +97,7 @@ def sync_versions(self, request, **kwargs):
         except Exception as e:
             return self.create_response(
                 request,
-                {'exception': e.message},
+                {'exception': str(e)},
                 response_class=HttpApplicationError,
             )
         return self.create_response(request, deleted_versions)

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,6 @@
 """Utility classes for api module"""
+from __future__ import absolute_import
+from builtins import object
 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,13 +1,17 @@
 """Models for the bookmarks app."""
 
+from __future__ import absolute_import
+from builtins import object
 from django.db import models
 from django.contrib.auth.models import User
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from readthedocs.builds.models import Version
 from readthedocs.projects.models import Project
 
 
+@python_2_unicode_compatible
 class Bookmark(models.Model):
 
     """A user's bookmark of a ``Project``, ``Version``, and page."""
@@ -23,11 +27,11 @@ class Bookmark(models.Model):
     date = models.DateTimeField(_('Date'), auto_now_add=True)
     url = models.CharField(_('URL'), max_length=255, null=True, blank=True)
 
-    class Meta:
+    class Meta(object):
         ordering = ['-date']
         unique_together = ('user', 'project', 'version', 'page')
 
-    def __unicode__(self):
+    def __str__(self):
         return ugettext(u"Bookmark %(url)s for %(user)s (%(pk)s)") % {
             'url': self.url,
             'user': self.user,

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,7 @@
 """Django forms for the builds app."""
 
+from __future__ import absolute_import
+from builtins import object
 from django import forms
 
 from readthedocs.builds.models import VersionAlias, Version
@@ -9,7 +11,7 @@
 
 class AliasForm(forms.ModelForm):
 
-    class Meta:
+    class Meta(object):
         model = VersionAlias
         fields = (
             'project',
@@ -27,7 +29,7 @@ def __init__(self, instance=None, *args, **kwargs):
 
 class VersionForm(forms.ModelForm):
 
-    class Meta:
+    class Meta(object):
         model = Version
         fields = ['active', 'privacy_level', 'tags']
 

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,7 @@
 """Models for the builds app."""
 
+from __future__ import absolute_import
+from builtins import object
 import logging
 import re
 import os.path
@@ -8,6 +10,7 @@
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from guardian.shortcuts import assign
@@ -33,6 +36,7 @@
 log = logging.getLogger(__name__)
 
 
+@python_2_unicode_compatible
 class Version(models.Model):
 
     """Version of a ``Project``."""
@@ -77,7 +81,7 @@ class Version(models.Model):
 
     objects = VersionManager.from_queryset(VersionQuerySet)()
 
-    class Meta:
+    class Meta(object):
         unique_together = [('project', 'slug')]
         ordering = ['-verbose_name']
         permissions = (
@@ -86,7 +90,7 @@ class Meta:
             ('view_version', _('View Version')),
         )
 
-    def __unicode__(self):
+    def __str__(self):
         return ugettext(u"Version %(version)s of %(project)s (%(pk)s)" % {
             'version': self.verbose_name,
             'project': self.project,
@@ -299,6 +303,7 @@ def get_bitbucket_url(self, docroot, filename, source_suffix='.rst'):
         )
 
 
+@python_2_unicode_compatible
 class VersionAlias(models.Model):
 
     """Alias for a ``Version``."""
@@ -310,14 +315,15 @@ class VersionAlias(models.Model):
                                blank=True)
     largest = models.BooleanField(_('Largest'), default=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return ugettext(u"Alias for %(project)s: %(from)s -> %(to)s" % {
             'project': self.project,
             'from': self.from_slug,
             'to': self.to_slug,
         })
 
 
+@python_2_unicode_compatible
 class Build(models.Model):
 
     """Build data."""
@@ -348,14 +354,14 @@ class Build(models.Model):
 
     objects = BuildQuerySet.as_manager()
 
-    class Meta:
+    class Meta(object):
         ordering = ['-date']
         get_latest_by = 'date'
         index_together = [
             ['version', 'state', 'type']
         ]
 
-    def __unicode__(self):
+    def __str__(self):
         return ugettext(u"Build %(project)s for %(usernames)s (%(pk)s)" % {
             'project': self.project,
             'usernames': ' '.join(self.project.users.all()
@@ -395,6 +401,7 @@ def failed(self):
         return not self.successful
 
 
+@python_2_unicode_compatible
 class BuildCommandResult(BuildCommandResultMixin, models.Model):
 
     """Build command for a ``Build``."""
@@ -410,13 +417,13 @@ class BuildCommandResult(BuildCommandResultMixin, models.Model):
     start_time = models.DateTimeField(_('Start time'))
     end_time = models.DateTimeField(_('End time'))
 
-    class Meta:
+    class Meta(object):
         ordering = ['start_time']
         get_latest_by = 'start_time'
 
     objects = RelatedBuildQuerySet.as_manager()
 
-    def __unicode__(self):
+    def __str__(self):
         return (ugettext(u'Build command {pk} for build {build}')
                 .format(pk=self.pk, build=self.build))
 

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,15 @@
 another number would be confusing.
 """
 
+from __future__ import absolute_import
+from builtins import range
 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:
@@ -89,15 +92,15 @@ def uniquifying_suffix(self, iteration):
             uniquifying_suffix(26) == '_ba'
             uniquifying_suffix(52) == '_ca'
         """
-        alphabet = string.lowercase
+        alphabet = string.ascii_lowercase
         length = len(alphabet)
         if iteration == 0:
             power = 0
         else:
             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,7 @@
 """Views for builds app."""
 
+from __future__ import absolute_import
+from builtins import object
 import logging
 
 from django.shortcuts import get_object_or_404

readthedocs/cdn/purge.py

@@ -1,8 +1,11 @@
 """Utility to purge MaxCDN files, if configured."""
 
+from __future__ import absolute_import
+from builtins import range
 import logging
 
 from django.conf import settings
+from six.moves import range
 
 log = logging.getLogger(__name__)
 
@@ -14,7 +17,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