svn commit: r1668395 - /steve/trunk/pytest/www/cgi-bin/rest_admin.py

[hu...@apache.org]

Author: humbedooh
Date: Sun Mar 22 15:58:37 2015
New Revision: 1668395

URL: http://svn.apache.org/r1668395
Log:
strip away unnecessary whitespace, fix typo

Modified:
    steve/trunk/pytest/www/cgi-bin/rest_admin.py

Modified: steve/trunk/pytest/www/cgi-bin/rest_admin.py
URL: http://svn.apache.org/viewvc/steve/trunk/pytest/www/cgi-bin/rest_admin.py?rev=1668395&r1=1668394&r2=1668395&view=diff
==============================================================================
--- steve/trunk/pytest/www/cgi-bin/rest_admin.py (original)
+++ steve/trunk/pytest/www/cgi-bin/rest_admin.py Sun Mar 22 15:58:37 2015
@@ -84,7 +84,7 @@ else:
                 response.respond(206, { 'elections': output, 'errors': errors})
             else:
                 response.respond(200, { 'elections': output})
-        # Set up new electionID?
+        # Set up new election?
         elif action == "setup":
             if karma >= 5: # karma of 5 required to set up an election base
                 if electionID:
@@ -105,7 +105,7 @@ else:
                                 f.write(json.dumps({
                                     'title': form.getvalue('title'),
                                     'owner': form.getvalue('owner'),
-                                    'monitors': form.getvalue('monitors').split(","),
+                                    'monitors': [f.strip() for f in form.getvalue('monitors').split(",")],
                                     'starts': form.getvalue('starts'),
                                     'ends': form.getvalue('ends'),
                                     'hash': hashlib.sha512("%f-stv-%s" % (time.time(), os.environ['REMOTE_ADDR'])).hexdigest(),
@@ -147,13 +147,13 @@ else:
                                     candidates = []
                                     if form.getvalue('candidates'):
                                         for name in form.getvalue('candidates').split("\n"):
-                                            candidates.append({'name': name})
+                                            candidates.append({'name': name.strip()})
                                     f.write(json.dumps({
                                         'title': form.getvalue('title'),
                                         'description': form.getvalue('description'),
                                         'type': form.getvalue('type'),
                                         'candidates': candidates,
-                                        'seconds': form.getvalue('seconds').split("\n") if form.getvalue('seconds') else [],
+                                        'seconds': [f.strip() for f in form.getvalue('seconds').split("\n")] if form.getvalue('seconds') else [],
                                         'nominatedby': form.getvalue('nominatedby')
                                     }))
                                     f.close()
@@ -209,7 +209,7 @@ else:
                                     val = form.getvalue(field)
                                     if val:
                                         if field == "monitors":
-                                            val = val.split(",")
+                                            val = [f.strip() for f in val.split(",")]
                                         js[field] = val
                                 with open(elpath + "/basedata.json", "w") as f:
                                     f.write(json.dumps(js))
@@ -235,9 +235,9 @@ else:
                                             xval = val.split("\n")
                                             val = []
                                             for entry in xval:
-                                                val.append({'name': entry})
+                                                val.append({'name': entry.strip()})
                                         if field == "seconds":
-                                            val = val.split("\n")
+                                            val = [f.strip() for f in val.split("\n")]
                                         js[field] = val
                                 with open(issuepath + ".json", "w") as f:
                                     f.write(json.dumps(js))