rewrite logic to put some key at the beginning of the OrderedDict

devel/forms.py

@@ -53,15 +53,11 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super(NewUserForm, self).__init__(*args, **kwargs)
         # Hack ourself so certain fields appear first
-        old = self.fields
-        self.fields = OrderedDict()
         keys = ('username', 'private_email', 'first_name', 'last_name',
                 'alias', 'public_email')
-        for key in keys:
-            self.fields[key] = old[key]
-        for key, _ in list(old.items()):
-            if key not in keys:
-                self.fields[key] = old[key]
+        # add all remaining keys afterwards
+        keys += tuple(k for k in self.fields.keys() if k not in keys)
+        self.fields = OrderedDict((key, old[key]) for key in keys)
 
     def clean_username(self):
         username = self.cleaned_data['username']