removed demjson dependency and moved over to Python 2.6

pgbovine · pgbovine · commit 6cd960e5ba7f · 2012-07-16T21:16:47.000-07:00
diff --git a/README b/README
@@ -43,7 +43,7 @@ System architecture overview:
 The Online Python Tutor is implemented as a web application, with a
 JavaScript front-end making AJAX calls to a pure-Python back-end.
 
-The back-end has been tested on an Apache server running Python 2.5
+The back-end has been tested on an Apache server running Python 2.6
 through CGI.  Note that it will probably fail in subtle ways on other
 Python 2.X (and will DEFINITELY fail on Python 3.X).  Peter Wentworth
 has create a port to Python 3.X, and hopefully we can eventually
@@ -97,8 +97,6 @@ The back-end resides in the cgi-bin/ sub-directory in this repository:
                             grading back-end
   cgi-bin/pg_logger.py    - the 'meat' of the back-end
   cgi-bin/pg_encoder.py   - encodes Python data into JSON
-  cgi-bin/demjson.py      - 3rd-party JSON module, since Python 2.5
-                            doesn't have the built-in 'import json'
   cgi-bin/create_db.py    - for optional sqlite query logging
   cgi-bin/db_common.py    - for optional sqlite query logging
   cgi-bin/.htaccess       - for Apache CGI execute permissions
diff --git a/cgi-bin/demjson.py b/cgi-bin/demjson.py
diff --git a/cgi-bin/load_question.py b/cgi-bin/load_question.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python2.6
 
 # Online Python Tutor
 # https://github.com/pgbovine/OnlinePythonTutor/
diff --git a/cgi-bin/pg_logger.py b/cgi-bin/pg_logger.py
@@ -28,7 +28,7 @@
 # Python debugger imported via the bdb module), printing out the values
 # of all in-scope data structures after each executed instruction.
 
-# Note that I've only tested this logger on Python 2.5, so it will
+# Note that I've only tested this logger on Python 2.6, so it will
 # probably fail in subtle ways on other Python 2.X (and will DEFINITELY
 # fail on Python 3.X).
 
diff --git a/cgi-bin/web_exec.py b/cgi-bin/web_exec.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python2.6
 
 # Online Python Tutor
 # https://github.com/pgbovine/OnlinePythonTutor/
@@ -31,8 +31,8 @@
 #
 # Returns a complete JSON execution trace to the front-end.
 #
-# This version uses Python 2.5 on the MIT CSAIL servers.
-# (note that Python 2.4 doesn't work on CSAIL, but Python 2.5 does)
+# This version uses Python 2.6 on the MIT CSAIL servers.
+# (note that Python 2.4 doesn't work on CSAIL, but Python 2.6 does)
 #
 # If you want to run this script, then you'll need to change the
 # shebang line at the top of this file to point to your system's Python.
@@ -50,17 +50,15 @@
 import cgi
 import pg_logger
 
-# Python 2.5 doesn't have a built-in json module, so I'm using a
-# 3rd-party module.  I think you can do 'import json' in Python >= 2.6
-import demjson
+import json
 
 if LOG_QUERIES:
   import os, time, db_common
 
 def web_finalizer(output_lst):
   # use compactly=False to produce human-readable JSON,
   # except at the expense of being a LARGER download
-  output_json = demjson.encode(output_lst, compactly=True)
+  output_json = json.dumps(output_lst)
 
   # query logging is optional
   if LOG_QUERIES:
diff --git a/cgi-bin/web_run_test.py b/cgi-bin/web_run_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python2.6
 
 # Online Python Tutor
 # https://github.com/pgbovine/OnlinePythonTutor/
@@ -33,9 +33,7 @@
 import cgi
 import pg_logger
 
-# Python 2.5 doesn't have a built-in json module, so I'm using a
-# 3rd-party module.  I think you can do 'import json' in Python >= 2.6
-import demjson
+import json
 
 user_trace = None # the FULL user trace (without any IDs, though)
 expect_trace_final_entry = None
@@ -67,7 +65,7 @@ def expect_script_finalizer(output_lst):
     # Crucial first line to make sure that Apache serves this data
     # correctly - DON'T FORGET THE EXTRA NEWLINES!!!:
     print "Content-type: text/plain; charset=iso-8859-1\n\n"
-    output_json = demjson.encode(ret, compactly=True)
+    output_json = json.dumps(ret)
     print output_json
 
   else:
diff --git a/question.html b/question.html
@@ -202,7 +202,7 @@
 
 <p/>
 This application supports the core <a
-href="http://www.python.org/doc/2.5/">Python 2.5</a> language, with no
+href="http://docs.python.org/release/2.6/">Python 2.6</a> language, with no
 module imports or file I/O.  It's meant to be used as a platform for
 creating programming tutorials, not for running or debugging
 production code.
diff --git a/tutor.html b/tutor.html
@@ -197,7 +197,7 @@
 
 <p/>
 This application supports the core <a
-href="http://www.python.org/doc/2.5/">Python 2.5</a> language, with no
+href="http://docs.python.org/release/2.6/">Python 2.6</a> language, with no
 module imports or file I/O.  It's meant to be used as a platform for
 creating programming tutorials, not for running or debugging
 production code.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/python2.5`
	`1`	`+#!/usr/bin/python2.6`
`2`	`2`
`3`	`3`	`# Online Python Tutor`
`4`	`4`	`# https://github.com/pgbovine/OnlinePythonTutor/`