Merge branch 'move-validators' of https://github.com/mashrikt/readthe…

…docs.org into mashrikt-move-validators
readthedocs · Jun 6, 2018 · 0008bfe · 0008bfe
2 parents 6cd82f7 + 84b6ed8
commit 0008bfe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/readthedocs/projects/migrations/0010_migrate_domain_data.py b/readthedocs/projects/migrations/0010_migrate_domain_data.py
@@ -4,7 +4,7 @@
 from django.db import models, migrations
 from future.backports.urllib.parse import urlparse
 
-import readthedocs.core.validators
+import readthedocs.projects.validators
 
 
 def migrate_url(apps, schema_editor):
@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='domain',
             name='domain',
-            field=models.CharField(unique=True, max_length=255, verbose_name='Domain', validators=[readthedocs.core.validators.DomainNameValidator()]),
+            field=models.CharField(unique=True, max_length=255, verbose_name='Domain', validators=[readthedocs.projects.validators.DomainNameValidator()]),
 
         ),
     ]
diff --git a/readthedocs/projects/models.py b/readthedocs/projects/models.py
@@ -22,13 +22,13 @@
 from readthedocs.builds.constants import LATEST, LATEST_VERBOSE_NAME, STABLE
 from readthedocs.core.resolver import resolve, resolve_domain
 from readthedocs.core.utils import broadcast, slugify
-from readthedocs.core.validators import validate_domain_name, validate_repository_url
 from readthedocs.projects import constants
 from readthedocs.projects.exceptions import ProjectConfigurationError
 from readthedocs.projects.querysets import (
     ChildRelatedProjectQuerySet, FeatureQuerySet, ProjectQuerySet,
     RelatedProjectQuerySet)
 from readthedocs.projects.templatetags.projects_tags import sort_version_aware
+from readthedocs.projects.validators import validate_domain_name, validate_repository_url
 from readthedocs.projects.version_handling import (
     determine_stable_version, version_windows)
 from readthedocs.restapi.client import api

diff --git a/readthedocs/core/validators.py → readthedocs/projects/validators.py b/readthedocs/core/validators.py → readthedocs/projects/validators.py
@@ -1,4 +1,4 @@
-"""Validators for core app."""
+"""Validators for projects app."""
 
 # From https://github.com/django/django/pull/3477/files
 from __future__ import absolute_import

diff --git a/readthedocs/vcs_support/backends/git.py b/readthedocs/vcs_support/backends/git.py
@@ -14,8 +14,8 @@
 from git.exc import BadName
 from six import PY2, StringIO
 
-from readthedocs.core.validators import validate_submodule_url
 from readthedocs.projects.exceptions import RepositoryError
+from readthedocs.projects.validators import validate_submodule_url
 from readthedocs.vcs_support.base import BaseVCS, VCSVersion
 from builtins import str