Code quality improvements

src/formrender.py

@@ -180,9 +180,12 @@ class FormRender(object):
             checked = ''
             if o_value == value:
                 checked = 'checked'
-            radio_elems.append(tpl_option.format(name=name, value=value,
+            radio_elems.append(tpl_option.format(name=name,
-                               checked=checked, label=o_label, classes=classes,
+                                                 value=value,
-                               style=style))
+                                                 checked=checked,
+                                                 label=o_label,
+                                                 classes=classes,
+                                                 style=style))
         return u''.join(radio_elems)
 
     def r_field_checkbox(self, name, checked, classes='', style=""):
@@ -204,8 +207,9 @@ class FormRender(object):
             if o_value == value:
                 selected = 'selected'
             select_elems.append(tpl_option.format(value=o_value,
-                                selected=selected, label=o_label,
+                                                  selected=selected,
-                                style=style))
+                                                  label=o_label,
+                                                  style=style))
 
         tpl = self.field_tpl['select']
         return tpl.format(name=name, select_elems=''.join(select_elems),

src/scriptform.py

@@ -203,7 +203,7 @@ def main():  # pragma: no cover
         # Generate a password for use in the `users` section
         import getpass
         plain_pw = getpass.getpass()
-        if not plain_pw == getpass.getpass('Repeat password: '):
+        if plain_pw != getpass.getpass('Repeat password: '):
             sys.stderr.write("Passwords do not match.\n")
             sys.exit(1)
         sys.stdout.write(hashlib.sha256(plain_pw).hexdigest() + '\n')