Merge branch 'migrate-v1-to-v2' of https://github.com/ginstrom/readthedocs.org into ginstrom-migrate-v1-to-v2

Author: ericholscher

readthedocs/projects/models.py

@@ -18,9 +18,7 @@
 from taggit.managers import TaggableManager
 
 from readthedocs.core.utils import broadcast, slugify
-# transitioning from v1 to v2, rename for now, remove later
 from readthedocs.restapi.client import api
-from readthedocs.restapi.client import api as apiv2
 from readthedocs.builds.constants import LATEST, LATEST_VERBOSE_NAME, STABLE
 from readthedocs.projects import constants
 from readthedocs.projects.exceptions import ProjectImportError
@@ -359,7 +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']
+            return api.project(self.pk).canonical_url().get()['url']
         return self.get_docs_url()
 
     def get_subproject_urls(self):
@@ -370,7 +368,7 @@ def get_subproject_urls(self):
         if getattr(settings, 'DONT_HIT_DB', True):
             return [(proj['slug'], proj['canonical_url'])
                     for proj in (
-                        apiv2.project(self.pk)
+                        api.project(self.pk)
                         .subprojects()
                         .get()['subprojects'])]
         return [(proj.child.slug, proj.child.get_docs_url())