From 378231e850f3ffb532223270560a05b72d3a0607 Mon Sep 17 00:00:00 2001 From: bashmak Date: Wed, 5 Jul 2017 13:47:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D1=91=D1=81=20?= =?UTF-8?q?=D1=81=D1=8E=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {abonapp => djing}/fields.py | 0 {abonapp => djing}/formfields.py | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename {abonapp => djing}/fields.py (100%) rename {abonapp => djing}/formfields.py (94%) diff --git a/abonapp/fields.py b/djing/fields.py similarity index 100% rename from abonapp/fields.py rename to djing/fields.py diff --git a/abonapp/formfields.py b/djing/formfields.py similarity index 94% rename from abonapp/formfields.py rename to djing/formfields.py index 4e61e3c..bcd961f 100644 --- a/abonapp/formfields.py +++ b/djing/formfields.py @@ -5,10 +5,11 @@ from django.forms.fields import EMPTY_VALUES from django.forms.utils import ValidationError from django.utils.translation import ugettext_lazy as _ from netaddr import EUI, AddrFormatError +from . import MAC_ADDR_REGEX mac_address_validator = RegexValidator( - _lazy_re_compile(r'^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$'), + _lazy_re_compile(MAC_ADDR_REGEX), message=_('Enter a valid integer.'), code='invalid', )