Merge branch 'master' of /srv/git/repositories/parabolaweb

1 files changed, 5 insertions, 3 deletions

diff --git a/mirrors/admin.py b/mirrors/admin.py
index b7b478de..3786d8d2 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -33,14 +33,15 @@ class MirrorUrlInlineAdmin(admin.TabularInline):
     extra = 3
 
 # ripped off from django.forms.fields, adding netmask ability
-ipv4nm_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}(/(\d|[1-2]\d|3[0-2])){0,1}$')
+IPV4NM_RE = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}(/(\d|[1-2]\d|3[0-2])){0,1}$')
+
 class IPAddressNetmaskField(forms.fields.RegexField):
     default_error_messages = {
         'invalid': u'Enter a valid IPv4 address, possibly including netmask.',
     }
 
     def __init__(self, *args, **kwargs):
-        super(IPAddressNetmaskField, self).__init__(ipv4nm_re, *args, **kwargs)
+        super(IPAddressNetmaskField, self).__init__(IPV4NM_RE, *args, **kwargs)
 
 class MirrorRsyncForm(forms.ModelForm):
     class Meta:
@@ -59,7 +60,8 @@ class MirrorAdminForm(forms.ModelForm):
 
 class MirrorAdmin(admin.ModelAdmin):
     form = MirrorAdminForm
-    list_display = ('name', 'tier', 'country', 'active', 'public', 'isos', 'admin_email', 'supported_protocols')
+    list_display = ('name', 'tier', 'country', 'active', 'public',
+            'isos', 'admin_email')
     list_filter = ('tier', 'active', 'public', 'country') 
     search_fields = ('name',)
     inlines = [