Changeset 6534

Timestamp:

Jan 2, 2009, 11:55:58 PM (16 years ago)

Author:

roland

Message:

Fixed bugs in regexp that checks hostnames and interface names.

File:

• trunk/exodus/forms.py (modified) (2 diffs)

trunk/exodus/forms.py

@@ -20 +20 @@
         name = self.cleaned_data.get('name')
         re_name = re.compile('[0-9a-zA-Z-]+')
-        if not name == re_name.match(name).group():
+        if not re_name.match(name) or re_name.match(name) != name:
             raise forms.ValidationError(
                     'Not a valid name. Use letters, digits and -.')
@@ -404 +404 @@
         hostname = self.cleaned_data.get('hostname')
         re_hostname = re.compile('[0-9a-zA-Z-]+')
-        if not hostname == re_hostname.match(hostname).group():
+        if not re_hostname.match(hostname) or \
+            re_hostname.match(hostname).group() != hostname:
             raise forms.ValidationError(
                     'Not a valid hostname. Use letters, digits and -.')