Make some part of the codebase single source
parent
29df29eb45
commit
0962c941f1
|
@ -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):
|
||||
|
|
|
@ -1,10 +1,15 @@
|
|||
# -*- 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):
|
||||
|
@ -12,8 +17,8 @@ def migrate_url(apps, schema_editor):
|
|||
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:
|
||||
|
|
|
@ -3,7 +3,13 @@
|
|||
import fnmatch
|
||||
import logging
|
||||
import os
|
||||
from urlparse import urlparse
|
||||
|
||||
import sys
|
||||
|
||||
if sys.version_info > (3,):
|
||||
from urllib.parse import urlparse
|
||||
else:
|
||||
from urlparse import urlparse
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -1,6 +1,12 @@
|
|||
import csv
|
||||
import re
|
||||
from StringIO import StringIO
|
||||
|
||||
import sys
|
||||
|
||||
if sys.version_info > (3,):
|
||||
from io import StringIO
|
||||
else:
|
||||
from StringIO import StringIO
|
||||
|
||||
from readthedocs.projects.exceptions import ProjectImportError
|
||||
from readthedocs.vcs_support.base import BaseVCS, VCSVersion
|
||||
|
|
|
@ -2,7 +2,12 @@ import re
|
|||
import logging
|
||||
import csv
|
||||
import os
|
||||
from StringIO import StringIO
|
||||
|
||||
import sys
|
||||
if sys.version_info > (3,):
|
||||
from io import StringIO
|
||||
else:
|
||||
from StringIO import StringIO
|
||||
|
||||
from readthedocs.projects.exceptions import ProjectImportError
|
||||
from readthedocs.vcs_support.base import BaseVCS, VCSVersion
|
||||
|
|
|
@ -1,5 +1,11 @@
|
|||
import csv
|
||||
from StringIO import StringIO
|
||||
|
||||
import sys
|
||||
if sys.version_info > (3,):
|
||||
from io import StringIO
|
||||
else:
|
||||
from StringIO import StringIO
|
||||
|
||||
|
||||
from readthedocs.projects.exceptions import ProjectImportError
|
||||
from readthedocs.vcs_support.base import BaseVCS, VCSVersion
|
||||
|
|
Loading…
Reference in New Issue