svn commit: r1704030 - in /comdev/projects.apache.org: scripts/import/parsecommittees.py scripts/import/parseprojects.py site/edit/save.py

[se...@apache.org]

Author: sebb
Date: Sat Sep 19 13:43:11 2015
New Revision: 1704030

URL: http://svn.apache.org/viewvc?rev=1704030&view=rev
Log:
Write json direct to file instead of converting to string first

Modified:
    comdev/projects.apache.org/scripts/import/parsecommittees.py
    comdev/projects.apache.org/scripts/import/parseprojects.py
    comdev/projects.apache.org/site/edit/save.py

Modified: comdev/projects.apache.org/scripts/import/parsecommittees.py
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/import/parsecommittees.py?rev=1704030&r1=1704029&r2=1704030&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/import/parsecommittees.py (original)
+++ comdev/projects.apache.org/scripts/import/parsecommittees.py Sat Sep 19 13:43:11 2015
@@ -325,10 +325,10 @@ for previous in committeesPrevious:
 
 print("Writing json/foundation/committees.json...")
 with open("../../site/json/foundation/committees.json", "w") as f:
-    f.write(json.dumps(committeesList, sort_keys=True, indent=0))
+    json.dump(committeesList, f, sort_keys=True, indent=0)
     f.close()
 
 print("Writing json/foundation/committees-retired.json...")
 with open("../../site/json/foundation/committees-retired.json", "w") as f:
-    f.write(json.dumps(committeesRetired, sort_keys=True, indent=0))
+    json.dump(committeesRetired, f, sort_keys=True, indent=0)
     f.close()

Modified: comdev/projects.apache.org/scripts/import/parseprojects.py
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/scripts/import/parseprojects.py?rev=1704030&r1=1704029&r2=1704030&view=diff
==============================================================================
--- comdev/projects.apache.org/scripts/import/parseprojects.py (original)
+++ comdev/projects.apache.org/scripts/import/parseprojects.py Sat Sep 19 13:43:11 2015
@@ -199,7 +199,7 @@ for s in itemlist :
             #    pjson[e] = add[e]
             print("Writing projects/%-40s + copying source DOAP to doap/%s/%s.rdf..." % (projectJsonFilename+".json", committeeId, projectJsonFilename))
             with open ("../../site/json/projects/%s.json" % projectJsonFilename, "w") as f:
-                f.write(json.dumps(pjson, sort_keys=True, indent=0))
+                json.dump(pjson, f, sort_keys=True, indent=0)
                 f.close()
             # copy project DOAP to /doap/<committee id>/<project id>.rdf
             with open ("../../site/doap/%s/%s.rdf" % (committeeId, projectJsonFilename), "wb") as f:
@@ -221,7 +221,7 @@ for s in itemlist :
 if save:
     print("Writing foundation/projects.json...")
     with open ("../../site/json/foundation/projects.json", "w") as f:
-        f.write(json.dumps(projects, sort_keys=True, indent=0))
+        json.dump(projects, f, sort_keys=True, indent=0)
         f.close()
 
 if len(failures) > 0:

Modified: comdev/projects.apache.org/site/edit/save.py
URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/site/edit/save.py?rev=1704030&r1=1704029&r2=1704030&view=diff
==============================================================================
--- comdev/projects.apache.org/site/edit/save.py (original)
+++ comdev/projects.apache.org/site/edit/save.py Sat Sep 19 13:43:11 2015
@@ -24,7 +24,7 @@ try:
         for k in form:
             js[k] = form[k].value
         with open("../json/projects/%s" % f, "w") as out:
-            out.write(json.dumps(js, sort_keys=True, indent=0))
+            json.dump(js, out, sort_keys=True, indent=0)
             out.close()
 
         with open("../json/foundation/projects.json", "r") as g:
@@ -33,7 +33,7 @@ try:
 
             gjson[project] = js
             with open("../json/foundation/projects.json", "w") as og:
-                og.write(json.dumps(gjson, sort_keys=True, indent=0))
+                json.dump(gjson, og, sort_keys=True, indent=0)
                 og.close()