| 1 |
commit: 150755168a0391d6238e194b06f8b88bfd063043 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Tue Jul 3 17:13:11 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Tue Jul 3 17:13:11 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=15075516 |
| 7 |
|
| 8 |
Updte validators |
| 9 |
|
| 10 |
--- |
| 11 |
gpackages/apps/packages/models.py | 6 ++++-- |
| 12 |
gpackages/libs/package_info/validators.py | 6 +++++- |
| 13 |
2 files changed, 9 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py |
| 16 |
index a5ad484..966e4db 100644 |
| 17 |
--- a/gpackages/apps/packages/models.py |
| 18 |
+++ b/gpackages/apps/packages/models.py |
| 19 |
@@ -7,7 +7,8 @@ from package_info.repo_info import REPOS_TYPE |
| 20 |
# relative |
| 21 |
from .keywords import KeywordRepr |
| 22 |
#from utils import get_link |
| 23 |
-from package_info.validators import validate_url, validate_email |
| 24 |
+from package_info.validators import validate_url, validate_email, \ |
| 25 |
+ validate_name |
| 26 |
|
| 27 |
|
| 28 |
class AbstractDateTimeModel(models.Model): |
| 29 |
@@ -220,7 +221,8 @@ class HerdsModel(AbstractDateTimeModel): |
| 30 |
ordering = ('name',) |
| 31 |
|
| 32 |
class VirtualPackageModel(models.Model): |
| 33 |
- name = models.CharField(max_length = 254, db_index = True) |
| 34 |
+ name = models.CharField(max_length = 254, db_index = True, |
| 35 |
+ validators = [validate_name]) |
| 36 |
category = models.ForeignKey(CategoryModel) |
| 37 |
|
| 38 |
objects = managers.VirtualPackageManager() |
| 39 |
|
| 40 |
diff --git a/gpackages/libs/package_info/validators.py b/gpackages/libs/package_info/validators.py |
| 41 |
index 0b1fbc6..fbfed5e 100644 |
| 42 |
--- a/gpackages/libs/package_info/validators.py |
| 43 |
+++ b/gpackages/libs/package_info/validators.py |
| 44 |
@@ -1,5 +1,5 @@ |
| 45 |
# Validators |
| 46 |
-from django.core.validators import URLValidator, validate_email |
| 47 |
+from django.core.validators import URLValidator, validate_email, RegexValidator |
| 48 |
from django.core.exceptions import ValidationError |
| 49 |
|
| 50 |
validate_url = URLValidator() |
| 51 |
@@ -9,3 +9,7 @@ __all__ = ('validate_email', 'validate_url', 'ValidationError') |
| 52 |
REVISION_RE = r'r\d+' |
| 53 |
VERSION_RE = r'[\w.]+' |
| 54 |
NAME_RE = r'[\w+-]+' |
| 55 |
+ |
| 56 |
+validate_revision = RegexValidator('^%s$' % REVISION_RE) |
| 57 |
+validate_version = RegexValidator('^%s$' % VERSION_RE) |
| 58 |
+validate_name = RegexValidator('^%s$' % NAME_RE) |
Archives