Move h.validators -> h.schemas.validators

kael · Sep 27, 2018 · ee213f0 · ee213f0
1 parent 8962ed9
commit ee213f0
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/h/accounts/schemas.py b/h/accounts/schemas.py
@@ -7,13 +7,14 @@
 import deform
 from jinja2 import Markup
 
-from h import i18n, models, validators
+from h import i18n, models
 from h.models.user import (
  EMAIL_MAX_LENGTH,
  USERNAME_MAX_LENGTH,
  USERNAME_MIN_LENGTH,
  USERNAME_PATTERN,
 )
+from h.schemas import validators
 from h.schemas.base import CSRFSchema
 
 _ = i18n.TranslationString

diff --git a/h/groups/schemas.py b/h/groups/schemas.py
@@ -7,7 +7,7 @@
 import slugify
 
 from h import i18n
-from h import validators
+from h.schemas import validators
 from h.accounts.schemas import CSRFSchema
 from h.models.group import (
  GROUP_DESCRIPTION_MAX_LENGTH,

diff --git a/h/schemas/forms/accounts/edit_profile.py b/h/schemas/forms/accounts/edit_profile.py
@@ -5,11 +5,12 @@
 import colander
 import deform
 
-from h import i18n, validators
+from h import i18n
 from h.accounts import util
 from h.models.user import (
  DISPLAY_NAME_MAX_LENGTH,
 )
+from h.schemas import validators
 from h.schemas.base import CSRFSchema
 
 _ = i18n.TranslationString

diff --git a/h/schemas/forms/accounts/forgot_password.py b/h/schemas/forms/accounts/forgot_password.py
@@ -4,7 +4,8 @@
 import colander
 import deform
 
-from h import i18n, models, validators
+from h import i18n, models
+from h.schemas import validators
 from h.schemas.base import CSRFSchema
 
 _ = i18n.TranslationString

diff --git a/h/schemas/forms/accounts/util.py b/h/schemas/forms/accounts/util.py
@@ -4,7 +4,7 @@
 import colander
 import deform
 
-from h import validators
+from h.schemas import validators
 
 
 PASSWORD_MIN_LENGTH = 2 # FIXME: this is ridiculous

diff --git a/h/schemas/forms/admin/group.py b/h/schemas/forms/admin/group.py
@@ -6,7 +6,7 @@
 from deform.widget import SelectWidget, SequenceWidget, TextAreaWidget, TextInputWidget
 
 from h import i18n
-from h import validators
+from h.schemas import validators
 from h.models.group import (
  GROUP_NAME_MIN_LENGTH,
  GROUP_NAME_MAX_LENGTH,

diff --git a/h/schemas/forms/admin/organization.py b/h/schemas/forms/admin/organization.py
@@ -9,7 +9,7 @@
  ORGANIZATION_NAME_MIN_CHARS,
  ORGANIZATION_NAME_MAX_CHARS,
 )
-from h import validators
+from h.schemas import validators
 from h.schemas.base import CSRFSchema
 
 _ = h.i18n.TranslationString

diff --git a/h/validators.py → h/schemas/validators.py b/h/validators.py → h/schemas/validators.py
diff --git a/tests/h/validators_test.py → tests/h/schemas/validators_test.py b/tests/h/validators_test.py → tests/h/schemas/validators_test.py
@@ -6,7 +6,7 @@
 
 import colander
 
-from h.validators import Email
+from h.schemas.validators import Email
 
 
 class TestEmail(object):