Merge branch 'gthank-master'

Author: agjohnson

.gitignore

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

.travis.yml

@@ -1,26 +1,32 @@
 language: python
 python:
- - 2.7
+  - 2.7
+  - 3.6
 sudo: false
-env:
- - TOX_ENV=py27
- - TOX_ENV=docs
- - TOX_ENV=lint
- - TOX_ENV=eslint
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=docs
+    - python: 2.7
+      env: TOXENV=lint
+    - python: 2.7
+      env: TOXENV=eslint
+script:
+  - tox
 cache:
   directories:
     - ~/.cache/pip
     - ~/.nvm/nvm.sh
 install:
- - pip install tox
- - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
- - source ~/.nvm/nvm.sh
- - nvm install --lts
- - nvm use --lts
- - npm install
- - bower install
+  - pip install tox-travis
+  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
+  - source ~/.nvm/nvm.sh
+  - nvm install --lts
+  - nvm use --lts
+  - npm install
+  - bower install
 script:
- - tox -e $TOX_ENV
+  - tox
 notifications:
   slack:
     rooms:

prospector-more.yml

@@ -1,6 +1,39 @@
 inherits: prospector
 
-strictness: medium
+strictness: high
+
+ignore-paths:
+  - constants.py
+  - urls.py
+  - wsgi.py
+  - acl
+  - api
+  - betterversion
+  - bookmarks
+  - builds
+  - cdn
+  - comments
+  - core
+  - djangome
+  - doc_builder
+  - donate
+  - gold
+  - integrations
+  - locale
+  - notifications
+  - oauth
+  - payments
+  - privacy
+  - profiles
+  - projects
+  - redirects
+  - restapi
+  - rtd_tests
+  - search
+  - settings
+  - tastyapi
+  - templates
+  - vcs_support
 
 pylint:
   options:

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
@@ -160,7 +162,7 @@ def is_authenticated(self, request, **kwargs):
 
 
 class EnhancedModelResource(ModelResource):
-    def obj_get_list(self, request=None, *_, **kwargs):
+    def obj_get_list(self, request=None, *_, **kwargs):  # pylint: disable=arguments-differ
         """
         A ORM-specific implementation of ``obj_get_list``.
 

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
@@ -24,8 +25,8 @@
 class BookmarkExistsView(View):
 
     @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(BookmarkExistsView, self).dispatch(*args, **kwargs)
+    def dispatch(self, request, *args, **kwargs):
+        return super(BookmarkExistsView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request):
         return HttpResponse(
@@ -80,8 +81,8 @@ class BookmarkListView(ListView):
     model = Bookmark
 
     @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(BookmarkListView, self).dispatch(*args, **kwargs)
+    def dispatch(self, request, *args, **kwargs):
+        return super(BookmarkListView, self).dispatch(request, *args, **kwargs)
 
     def get_queryset(self):
         return Bookmark.objects.filter(user=self.request.user)
@@ -93,8 +94,8 @@ class BookmarkAddView(View):
 
     @method_decorator(login_required)
     @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(BookmarkAddView, self).dispatch(*args, **kwargs)
+    def dispatch(self, request, *args, **kwargs):
+        return super(BookmarkAddView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request):
         return HttpResponse(
@@ -156,8 +157,8 @@ class BookmarkRemoveView(View):
 
     @method_decorator(login_required)
     @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(BookmarkRemoveView, self).dispatch(*args, **kwargs)
+    def dispatch(self, request, *args, **kwargs):
+        return super(BookmarkRemoveView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         return render_to_response(
@@ -175,30 +176,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/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,12 +29,12 @@ def __init__(self, instance=None, *args, **kwargs):
 
 class VersionForm(forms.ModelForm):
 
-    class Meta:
+    class Meta(object):
         model = Version
         fields = ['active', 'privacy_level', 'tags']
 
-    def save(self, *args, **kwargs):
-        obj = super(VersionForm, self).save(*args, **kwargs)
+    def save(self, commit=True):
+        obj = super(VersionForm, self).save(commit=commit)
         if obj.active and not obj.built and not obj.uploaded:
             trigger_build(project=obj.project, version=obj)
         return obj

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