Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
---------------------------------------------------------------
commit 23507d66cc7af9dedc3e9b36fb8ea540cfef8983
Author: Peter Hatina <phatina(a)redhat.com>
Date: Sun Oct 7 10:19:54 2012 +0200
remove fqdn regexp
---------------------------------------------------------------
cli-tools/fmci/fmci_address.py | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/cli-tools/fmci/fmci_address.py b/cli-tools/fmci/fmci_address.py
index d69a7a4..6017ed2 100644
--- a/cli-tools/fmci/fmci_address.py
+++ b/cli-tools/fmci/fmci_address.py
@@ -170,17 +170,13 @@ class FmciIpv6Addr(object):
return rval
class FmciHostGenerator(object):
- PATTERN_TYPE_UNKNOWN, \
PATTERN_TYPE_FQDN, \
PATTERN_TYPE_IPV4, \
- PATTERN_TYPE_IPV6 = range(4)
+ PATTERN_TYPE_IPV6 = range(3)
@staticmethod
def recognizePatternType(pattern):
pattern_regexps = (
- ("(?=^.{1,254}$)(^(?:(?!\d+\.)[a-zA-Z0-9_\-]{1,63}\."
- "?)+(?:[a-zA-Z]{2,})$)",
- FmciHostGenerator.PATTERN_TYPE_FQDN),
("^(([\d]{1,3})|(\{([\d]{1,3}|[\d]{1,3}-[\d]{1,3})(;("
"[\d]{1,3}|[\d]{1,3}-[\d]{1,3}))*\}))\.(([\d]{1,3})"
"|(\{([\d]{1,3}|[\d]{1,3}-[\d]{1,3})(;([\d]{1,3}|[\d"
@@ -202,7 +198,7 @@ class FmciHostGenerator(object):
for (p, rval) in pattern_regexps:
if re.match(p, pattern):
return rval
- return FmciHostGenerator.PATTERN_TYPE_UNKNOWN
+ return FmciHostGenerator.PATTERN_TYPE_FQDN
@staticmethod
def enumerate(lst):