Merge pull request #1732 from Carreau/py3

Make some part of the codebase single source

Author: agjohnson

readthedocs/projects/migrations/0007_migrate_canonical_data.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import unicode_literals, print_function
 
 from django.db import migrations
 from django.db import transaction
@@ -15,12 +15,12 @@ def migrate_canonical(apps, schema_editor):
                         url=project.canonical_url,
                         canonical=True,
                     )
-                    print u"Added {url} to {project}".format(url=project.canonical_url, project=project.name)
-            except Exception, e:
-                print e
-                print u"Failed adding {url} to {project}".format(
+                    print(u"Added {url} to {project}".format(url=project.canonical_url, project=project.name))
+            except Exception as e:
+                print(e)
+                print(u"Failed adding {url} to {project}".format(
                     url=project.canonical_url, project=project.name
-                )
+                ))
 
 
 class Migration(migrations.Migration):

readthedocs/projects/migrations/0010_migrate_domain_data.py

@@ -1,19 +1,24 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import unicode_literals, print_function
 
 from django.db import models, migrations
 import readthedocs.core.validators
 
-from urlparse import urlparse
+import sys
+
+if sys.version_info > (3,):
+    import urllib.parse as urlparse
+else:
+    import urlparse
 
 
 def migrate_url(apps, schema_editor):
     Domain = apps.get_model("projects", "Domain")
     Domain.objects.filter(count=0).delete()
     for domain in Domain.objects.all():
         if domain.project.superprojects.count() or domain.project.main_language_project:
-            print "{project} is a subproject or translation. Deleting domain.".format(
-                project=domain.project.slug)
+            print("{project} is a subproject or translation. Deleting domain.".format(
+                project=domain.project.slug))
             domain.delete()
             continue
         parsed = urlparse(domain.url)
@@ -24,10 +29,10 @@ def migrate_url(apps, schema_editor):
         try:
             domain.domain = domain_string
             domain.save()
-            print u"Added {domain} from {url}".format(url=domain.url, domain=domain_string)
-        except Exception, e:
-            print e
-            print u"Failed {domain} from {url}".format(url=domain.url, domain=domain_string)
+            print(u"Added {domain} from {url}".format(url=domain.url, domain=domain_string))
+        except Exception as e:
+            print(e)
+            print(u"Failed {domain} from {url}".format(url=domain.url, domain=domain_string))
 
         dms = Domain.objects.filter(domain=domain_string).order_by('-count')
         if dms.count() > 1:

readthedocs/projects/models.py

@@ -2,8 +2,8 @@
 
 import fnmatch
 import logging
+import sys
 import os
-from urlparse import urlparse
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -34,6 +34,12 @@
 from readthedocs.vcs_support.backends import backend_cls
 from readthedocs.vcs_support.utils import Lock, NonBlockingLock
 
+if sys.version_info > (3,):
+    # pylint: disable=import-error
+    from urllib.parse import urlparse
+    # pylint: enable=import-error
+else:
+    from urlparse import urlparse
 
 log = logging.getLogger(__name__)
 

readthedocs/redirects/admin.py

@@ -1,5 +1,7 @@
+from __future__ import absolute_import
+
 from django.contrib import admin
-from models import Redirect
+from .models import Redirect
 
 
 class RedirectAdmin(admin.ModelAdmin):

readthedocs/vcs_support/backends/bzr.py

@@ -1,10 +1,15 @@
 import csv
 import re
-from StringIO import StringIO
+import sys
 
 from readthedocs.projects.exceptions import ProjectImportError
 from readthedocs.vcs_support.base import BaseVCS, VCSVersion
 
+if sys.version_info > (3,):
+    from io import StringIO
+else:
+    from StringIO import StringIO
+
 
 class Backend(BaseVCS):
     supports_tags = True

readthedocs/vcs_support/backends/git.py

@@ -2,11 +2,17 @@
 import logging
 import csv
 import os
-from StringIO import StringIO
+import sys
 
 from readthedocs.projects.exceptions import ProjectImportError
 from readthedocs.vcs_support.base import BaseVCS, VCSVersion
 
+if sys.version_info > (3,):
+    from io import StringIO
+else:
+    from StringIO import StringIO
+
+
 log = logging.getLogger(__name__)
 
 

readthedocs/vcs_support/backends/svn.py

@@ -1,9 +1,14 @@
 import csv
-from StringIO import StringIO
+import sys
 
 from readthedocs.projects.exceptions import ProjectImportError
 from readthedocs.vcs_support.base import BaseVCS, VCSVersion
 
+if sys.version_info > (3,):
+    from io import StringIO
+else:
+    from StringIO import StringIO
+
 
 class Backend(BaseVCS):
     supports_tags = False