", "globals": {"sum": 0, "friends": ["LIST", 1, "Joe", "Bill"], "length": 3, "f": "Joe"}, "stack_locals": [], "line": 7, "event": "step_line"}))
diff --git a/cgi-bin/parse_questions.py b/v1-v2/cgi-bin/parse_questions.py
similarity index 65%
rename from cgi-bin/parse_questions.py
rename to v1-v2/cgi-bin/parse_questions.py
index 5a3935f19..392ab43ae 100644
--- a/cgi-bin/parse_questions.py
+++ b/v1-v2/cgi-bin/parse_questions.py
@@ -1,19 +1,27 @@
# Online Python Tutor
-# Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
# https://github.com/pgbovine/OnlinePythonTutor/
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
# Defines a function that parses an Online Python Tutor 'questions file'
# into a dict, which can easily be converted into JSON
diff --git a/cgi-bin/pg_encoder.py b/v1-v2/cgi-bin/pg_encoder.py
similarity index 77%
rename from cgi-bin/pg_encoder.py
rename to v1-v2/cgi-bin/pg_encoder.py
index 2de1f97eb..01618dfe3 100644
--- a/cgi-bin/pg_encoder.py
+++ b/v1-v2/cgi-bin/pg_encoder.py
@@ -1,19 +1,26 @@
# Online Python Tutor
-# Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
# https://github.com/pgbovine/OnlinePythonTutor/
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Given an arbitrary piece of Python data, encode it in such a manner
diff --git a/cgi-bin/pg_logger.py b/v1-v2/cgi-bin/pg_logger.py
similarity index 89%
rename from cgi-bin/pg_logger.py
rename to v1-v2/cgi-bin/pg_logger.py
index 6c948af52..673c3dbf6 100644
--- a/cgi-bin/pg_logger.py
+++ b/v1-v2/cgi-bin/pg_logger.py
@@ -1,19 +1,26 @@
# Online Python Tutor
-# Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
# https://github.com/pgbovine/OnlinePythonTutor/
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# This is the meat of the Online Python Tutor back-end. It implements a
@@ -21,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/run_tests.py b/v1-v2/cgi-bin/run_tests.py
similarity index 78%
rename from cgi-bin/run_tests.py
rename to v1-v2/cgi-bin/run_tests.py
index 550815736..221bea85e 100644
--- a/cgi-bin/run_tests.py
+++ b/v1-v2/cgi-bin/run_tests.py
@@ -1,19 +1,26 @@
# Online Python Tutor
-# Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
# https://github.com/pgbovine/OnlinePythonTutor/
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Regression tests for Online Python Tutor back-end
@@ -23,7 +30,6 @@
import os, sys, re, shutil, filecmp, optparse, difflib
import pg_logger
-import demjson
# all tests are found in this directory:
@@ -35,7 +41,7 @@
def execute(test_script):
def my_finalizer(output_lst):
outfile = open(test_script[:-3] + '.out', 'w')
- output_json = demjson.encode(output_lst, compactly=False)
+ output_json = json.dumps(output_lst)
print >> outfile, output_json
pg_logger.exec_script_str(open(test_script).read(), my_finalizer, True)
diff --git a/cgi-bin/web_exec.py b/v1-v2/cgi-bin/web_exec.py
similarity index 64%
rename from cgi-bin/web_exec.py
rename to v1-v2/cgi-bin/web_exec.py
index 4df13f30c..9debc60ec 100755
--- a/cgi-bin/web_exec.py
+++ b/v1-v2/cgi-bin/web_exec.py
@@ -1,21 +1,28 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python2.6
# Online Python Tutor
-# Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
# https://github.com/pgbovine/OnlinePythonTutor/
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Executes the Online Python Tutor back-end as a CGI script, which
@@ -24,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.
@@ -43,9 +50,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
if LOG_QUERIES:
import os, time, db_common
@@ -53,7 +58,7 @@
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/v1-v2/cgi-bin/web_run_test.py
similarity index 77%
rename from cgi-bin/web_run_test.py
rename to v1-v2/cgi-bin/web_run_test.py
index c0ae45605..abe4592a6 100755
--- a/cgi-bin/web_run_test.py
+++ b/v1-v2/cgi-bin/web_run_test.py
@@ -1,21 +1,28 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python2.6
# Online Python Tutor
-# Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
# https://github.com/pgbovine/OnlinePythonTutor/
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Runs both 'user_script' and 'expect_script' and returns whether the
@@ -26,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
@@ -60,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:
@@ -122,7 +127,7 @@ def really_finalize():
# 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
diff --git a/edu-python-questions.js b/v1-v2/edu-python-questions.js
similarity index 90%
rename from edu-python-questions.js
rename to v1-v2/edu-python-questions.js
index dab19bd6d..7c1933a21 100644
--- a/edu-python-questions.js
+++ b/v1-v2/edu-python-questions.js
@@ -1,21 +1,28 @@
/*
Online Python Tutor
-Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
https://github.com/pgbovine/OnlinePythonTutor/
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
@@ -52,8 +59,9 @@ function resetTestResults() {
$(document).ready(function() {
eduPythonCommonInit(); // must call this first!
- $("#actualCodeInput").tabby(); // recognize TAB and SHIFT-TAB
- $("#testCodeInput").tabby(); // recognize TAB and SHIFT-TAB
+ // this doesn't work since we need jquery.textarea.js ...
+ //$("#actualCodeInput").tabby(); // recognize TAB and SHIFT-TAB
+ //$("#testCodeInput").tabby(); // recognize TAB and SHIFT-TAB
// be friendly to the browser's forward and back buttons
diff --git a/edu-python-title.css b/v1-v2/edu-python-title.css
similarity index 61%
rename from edu-python-title.css
rename to v1-v2/edu-python-title.css
index 55cb13448..9081041b8 100644
--- a/edu-python-title.css
+++ b/v1-v2/edu-python-title.css
@@ -1,21 +1,28 @@
/*
Online Python Tutor
-Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
https://github.com/pgbovine/OnlinePythonTutor/
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
diff --git a/edu-python-tutor.js b/v1-v2/edu-python-tutor.js
similarity index 82%
rename from edu-python-tutor.js
rename to v1-v2/edu-python-tutor.js
index 7905c3d57..7793f7818 100644
--- a/edu-python-tutor.js
+++ b/v1-v2/edu-python-tutor.js
@@ -1,21 +1,28 @@
/*
Online Python Tutor
-Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
https://github.com/pgbovine/OnlinePythonTutor/
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
@@ -40,7 +47,8 @@ function enterVisualizeMode(traceData) {
$(document).ready(function() {
eduPythonCommonInit(); // must call this first!
- $("#pyInput").tabby(); // recognize TAB and SHIFT-TAB
+ // this doesn't work since we need jquery.textarea.js ...
+ //$("#pyInput").tabby(); // recognize TAB and SHIFT-TAB
// be friendly to the browser's forward and back buttons
diff --git a/edu-python.css b/v1-v2/edu-python.css
similarity index 90%
rename from edu-python.css
rename to v1-v2/edu-python.css
index 5124fdf52..21d2ea64f 100644
--- a/edu-python.css
+++ b/v1-v2/edu-python.css
@@ -1,21 +1,28 @@
/*
Online Python Tutor
-Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
https://github.com/pgbovine/OnlinePythonTutor/
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
diff --git a/edu-python.js b/v1-v2/edu-python.js
similarity index 97%
rename from edu-python.js
rename to v1-v2/edu-python.js
index ee837e864..c5e2edaec 100644
--- a/edu-python.js
+++ b/v1-v2/edu-python.js
@@ -1,21 +1,28 @@
/*
Online Python Tutor
-Copyright (C) 2010-2011 Philip J. Guo (philip@pgbovine.net)
https://github.com/pgbovine/OnlinePythonTutor/
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+Copyright (C) 2010-2012 Philip J. Guo (philip@pgbovine.net)
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
diff --git a/v1-v2/example-code b/v1-v2/example-code
new file mode 120000
index 000000000..c24e6a160
--- /dev/null
+++ b/v1-v2/example-code
@@ -0,0 +1 @@
+../v3/example-code
\ No newline at end of file
diff --git a/grading-375.png b/v1-v2/grading-375.png
similarity index 100%
rename from grading-375.png
rename to v1-v2/grading-375.png
diff --git a/hunt-mcilroy.js b/v1-v2/hunt-mcilroy.js
similarity index 100%
rename from hunt-mcilroy.js
rename to v1-v2/hunt-mcilroy.js
diff --git a/index.html b/v1-v2/index.html
similarity index 81%
rename from index.html
rename to v1-v2/index.html
index c7694a825..4952d4d48 100644
--- a/index.html
+++ b/v1-v2/index.html
@@ -4,21 +4,28 @@
@@ -201,7 +208,7 @@ new practice problems in plain text format
diff --git a/jquery-1.3.2.min.js b/v1-v2/jquery-1.3.2.min.js
similarity index 100%
rename from jquery-1.3.2.min.js
rename to v1-v2/jquery-1.3.2.min.js
diff --git a/jquery.autogrow.js b/v1-v2/jquery.autogrow.js
similarity index 100%
rename from jquery.autogrow.js
rename to v1-v2/jquery.autogrow.js
diff --git a/jquery.ba-bbq.min.js b/v1-v2/jquery.ba-bbq.min.js
similarity index 100%
rename from jquery.ba-bbq.min.js
rename to v1-v2/jquery.ba-bbq.min.js
diff --git a/jquery.corner.js b/v1-v2/jquery.corner.js
similarity index 100%
rename from jquery.corner.js
rename to v1-v2/jquery.corner.js
diff --git a/jquery.jsPlumb-1.3.3-all-min.js b/v1-v2/jquery.jsPlumb-1.3.3-all-min.js
similarity index 100%
rename from jquery.jsPlumb-1.3.3-all-min.js
rename to v1-v2/jquery.jsPlumb-1.3.3-all-min.js
diff --git a/jquery.min.js b/v1-v2/jquery.min.js
similarity index 100%
rename from jquery.min.js
rename to v1-v2/jquery.min.js
diff --git a/jsplumb-test.js b/v1-v2/jsplumb-test.js
similarity index 100%
rename from jsplumb-test.js
rename to v1-v2/jsplumb-test.js
diff --git a/mock-data.js b/v1-v2/mock-data.js
similarity index 100%
rename from mock-data.js
rename to v1-v2/mock-data.js
diff --git a/question.html b/v1-v2/question.html
similarity index 78%
rename from question.html
rename to v1-v2/question.html
index 6ea6ea4d2..a60214513 100644
--- a/question.html
+++ b/v1-v2/question.html
@@ -4,21 +4,28 @@
@@ -40,8 +47,6 @@
-
-
@@ -195,7 +200,7 @@
This application supports the core Python 2.5 language, with no
+href="http://docs.python.org/release/2.6/">Python 2.6 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.
@@ -206,7 +211,7 @@
repository and send bug reports, feedback, and suggestions to philip@pgbovine.net
-Copyright © 2010-2011 Philip Guo. All rights reserved.
+Copyright © 2010-2012 Philip Guo. All rights reserved.
diff --git a/questions/debug-bsearch.txt b/v1-v2/questions/debug-bsearch.txt
similarity index 100%
rename from questions/debug-bsearch.txt
rename to v1-v2/questions/debug-bsearch.txt
diff --git a/questions/debug-ireverse.txt b/v1-v2/questions/debug-ireverse.txt
similarity index 100%
rename from questions/debug-ireverse.txt
rename to v1-v2/questions/debug-ireverse.txt
diff --git a/questions/debug-mergesort.txt b/v1-v2/questions/debug-mergesort.txt
similarity index 100%
rename from questions/debug-mergesort.txt
rename to v1-v2/questions/debug-mergesort.txt
diff --git a/questions/optimize-find-dups.txt b/v1-v2/questions/optimize-find-dups.txt
similarity index 100%
rename from questions/optimize-find-dups.txt
rename to v1-v2/questions/optimize-find-dups.txt
diff --git a/questions/optimize-search.txt b/v1-v2/questions/optimize-search.txt
similarity index 100%
rename from questions/optimize-search.txt
rename to v1-v2/questions/optimize-search.txt
diff --git a/questions/optimize-sum.txt b/v1-v2/questions/optimize-sum.txt
similarity index 100%
rename from questions/optimize-sum.txt
rename to v1-v2/questions/optimize-sum.txt
diff --git a/questions/remove-dups.txt b/v1-v2/questions/remove-dups.txt
similarity index 100%
rename from questions/remove-dups.txt
rename to v1-v2/questions/remove-dups.txt
diff --git a/questions/reverse.txt b/v1-v2/questions/reverse.txt
similarity index 100%
rename from questions/reverse.txt
rename to v1-v2/questions/reverse.txt
diff --git a/questions/two-sum.txt b/v1-v2/questions/two-sum.txt
similarity index 100%
rename from questions/two-sum.txt
rename to v1-v2/questions/two-sum.txt
diff --git a/red-sad-face.jpg b/v1-v2/red-sad-face.jpg
similarity index 100%
rename from red-sad-face.jpg
rename to v1-v2/red-sad-face.jpg
diff --git a/test-programs/caught_exception_1.golden b/v1-v2/test-programs/caught_exception_1.golden
similarity index 100%
rename from test-programs/caught_exception_1.golden
rename to v1-v2/test-programs/caught_exception_1.golden
diff --git a/test-programs/caught_exception_1.py b/v1-v2/test-programs/caught_exception_1.py
similarity index 100%
rename from test-programs/caught_exception_1.py
rename to v1-v2/test-programs/caught_exception_1.py
diff --git a/test-programs/caught_exception_2.golden b/v1-v2/test-programs/caught_exception_2.golden
similarity index 100%
rename from test-programs/caught_exception_2.golden
rename to v1-v2/test-programs/caught_exception_2.golden
diff --git a/test-programs/caught_exception_2.py b/v1-v2/test-programs/caught_exception_2.py
similarity index 100%
rename from test-programs/caught_exception_2.py
rename to v1-v2/test-programs/caught_exception_2.py
diff --git a/test-programs/circ_ref.golden b/v1-v2/test-programs/circ_ref.golden
similarity index 100%
rename from test-programs/circ_ref.golden
rename to v1-v2/test-programs/circ_ref.golden
diff --git a/test-programs/circ_ref.py b/v1-v2/test-programs/circ_ref.py
similarity index 100%
rename from test-programs/circ_ref.py
rename to v1-v2/test-programs/circ_ref.py
diff --git a/test-programs/circ_ref_2.golden b/v1-v2/test-programs/circ_ref_2.golden
similarity index 100%
rename from test-programs/circ_ref_2.golden
rename to v1-v2/test-programs/circ_ref_2.golden
diff --git a/test-programs/circ_ref_2.py b/v1-v2/test-programs/circ_ref_2.py
similarity index 100%
rename from test-programs/circ_ref_2.py
rename to v1-v2/test-programs/circ_ref_2.py
diff --git a/test-programs/circ_ref_fake.golden b/v1-v2/test-programs/circ_ref_fake.golden
similarity index 100%
rename from test-programs/circ_ref_fake.golden
rename to v1-v2/test-programs/circ_ref_fake.golden
diff --git a/test-programs/circ_ref_fake.py b/v1-v2/test-programs/circ_ref_fake.py
similarity index 100%
rename from test-programs/circ_ref_fake.py
rename to v1-v2/test-programs/circ_ref_fake.py
diff --git a/test-programs/class_test.golden b/v1-v2/test-programs/class_test.golden
similarity index 100%
rename from test-programs/class_test.golden
rename to v1-v2/test-programs/class_test.golden
diff --git a/test-programs/class_test.py b/v1-v2/test-programs/class_test.py
similarity index 100%
rename from test-programs/class_test.py
rename to v1-v2/test-programs/class_test.py
diff --git a/test-programs/class_test_2.golden b/v1-v2/test-programs/class_test_2.golden
similarity index 100%
rename from test-programs/class_test_2.golden
rename to v1-v2/test-programs/class_test_2.golden
diff --git a/test-programs/class_test_2.py b/v1-v2/test-programs/class_test_2.py
similarity index 100%
rename from test-programs/class_test_2.py
rename to v1-v2/test-programs/class_test_2.py
diff --git a/test-programs/class_test_3.golden b/v1-v2/test-programs/class_test_3.golden
similarity index 100%
rename from test-programs/class_test_3.golden
rename to v1-v2/test-programs/class_test_3.golden
diff --git a/test-programs/class_test_3.py b/v1-v2/test-programs/class_test_3.py
similarity index 100%
rename from test-programs/class_test_3.py
rename to v1-v2/test-programs/class_test_3.py
diff --git a/test-programs/data_test.golden b/v1-v2/test-programs/data_test.golden
similarity index 100%
rename from test-programs/data_test.golden
rename to v1-v2/test-programs/data_test.golden
diff --git a/test-programs/data_test.py b/v1-v2/test-programs/data_test.py
similarity index 100%
rename from test-programs/data_test.py
rename to v1-v2/test-programs/data_test.py
diff --git a/test-programs/dict_error.golden b/v1-v2/test-programs/dict_error.golden
similarity index 100%
rename from test-programs/dict_error.golden
rename to v1-v2/test-programs/dict_error.golden
diff --git a/test-programs/dict_error.py b/v1-v2/test-programs/dict_error.py
similarity index 100%
rename from test-programs/dict_error.py
rename to v1-v2/test-programs/dict_error.py
diff --git a/test-programs/dict_test.golden b/v1-v2/test-programs/dict_test.golden
similarity index 100%
rename from test-programs/dict_test.golden
rename to v1-v2/test-programs/dict_test.golden
diff --git a/test-programs/dict_test.py b/v1-v2/test-programs/dict_test.py
similarity index 100%
rename from test-programs/dict_test.py
rename to v1-v2/test-programs/dict_test.py
diff --git a/test-programs/exec_test.golden b/v1-v2/test-programs/exec_test.golden
similarity index 100%
rename from test-programs/exec_test.golden
rename to v1-v2/test-programs/exec_test.golden
diff --git a/test-programs/exec_test.py b/v1-v2/test-programs/exec_test.py
similarity index 100%
rename from test-programs/exec_test.py
rename to v1-v2/test-programs/exec_test.py
diff --git a/test-programs/func_exception.golden b/v1-v2/test-programs/func_exception.golden
similarity index 100%
rename from test-programs/func_exception.golden
rename to v1-v2/test-programs/func_exception.golden
diff --git a/test-programs/func_exception.py b/v1-v2/test-programs/func_exception.py
similarity index 100%
rename from test-programs/func_exception.py
rename to v1-v2/test-programs/func_exception.py
diff --git a/test-programs/generator_test.golden b/v1-v2/test-programs/generator_test.golden
similarity index 100%
rename from test-programs/generator_test.golden
rename to v1-v2/test-programs/generator_test.golden
diff --git a/test-programs/generator_test.py b/v1-v2/test-programs/generator_test.py
similarity index 100%
rename from test-programs/generator_test.py
rename to v1-v2/test-programs/generator_test.py
diff --git a/test-programs/import_error.golden b/v1-v2/test-programs/import_error.golden
similarity index 100%
rename from test-programs/import_error.golden
rename to v1-v2/test-programs/import_error.golden
diff --git a/test-programs/import_error.py b/v1-v2/test-programs/import_error.py
similarity index 100%
rename from test-programs/import_error.py
rename to v1-v2/test-programs/import_error.py
diff --git a/test-programs/infinite_loop.golden b/v1-v2/test-programs/infinite_loop.golden
similarity index 100%
rename from test-programs/infinite_loop.golden
rename to v1-v2/test-programs/infinite_loop.golden
diff --git a/test-programs/infinite_loop.py b/v1-v2/test-programs/infinite_loop.py
similarity index 100%
rename from test-programs/infinite_loop.py
rename to v1-v2/test-programs/infinite_loop.py
diff --git a/test-programs/infinite_loop_one_liner.golden b/v1-v2/test-programs/infinite_loop_one_liner.golden
similarity index 100%
rename from test-programs/infinite_loop_one_liner.golden
rename to v1-v2/test-programs/infinite_loop_one_liner.golden
diff --git a/test-programs/infinite_loop_one_liner.py b/v1-v2/test-programs/infinite_loop_one_liner.py
similarity index 100%
rename from test-programs/infinite_loop_one_liner.py
rename to v1-v2/test-programs/infinite_loop_one_liner.py
diff --git a/test-programs/lambda_1.golden b/v1-v2/test-programs/lambda_1.golden
similarity index 100%
rename from test-programs/lambda_1.golden
rename to v1-v2/test-programs/lambda_1.golden
diff --git a/test-programs/lambda_1.py b/v1-v2/test-programs/lambda_1.py
similarity index 100%
rename from test-programs/lambda_1.py
rename to v1-v2/test-programs/lambda_1.py
diff --git a/test-programs/list_dict_test.golden b/v1-v2/test-programs/list_dict_test.golden
similarity index 100%
rename from test-programs/list_dict_test.golden
rename to v1-v2/test-programs/list_dict_test.golden
diff --git a/test-programs/list_dict_test.py b/v1-v2/test-programs/list_dict_test.py
similarity index 100%
rename from test-programs/list_dict_test.py
rename to v1-v2/test-programs/list_dict_test.py
diff --git a/test-programs/list_test.golden b/v1-v2/test-programs/list_test.golden
similarity index 100%
rename from test-programs/list_test.golden
rename to v1-v2/test-programs/list_test.golden
diff --git a/test-programs/list_test.py b/v1-v2/test-programs/list_test.py
similarity index 100%
rename from test-programs/list_test.py
rename to v1-v2/test-programs/list_test.py
diff --git a/test-programs/newstyle_class.golden b/v1-v2/test-programs/newstyle_class.golden
similarity index 100%
rename from test-programs/newstyle_class.golden
rename to v1-v2/test-programs/newstyle_class.golden
diff --git a/test-programs/newstyle_class.py b/v1-v2/test-programs/newstyle_class.py
similarity index 100%
rename from test-programs/newstyle_class.py
rename to v1-v2/test-programs/newstyle_class.py
diff --git a/test-programs/one_func.golden b/v1-v2/test-programs/one_func.golden
similarity index 100%
rename from test-programs/one_func.golden
rename to v1-v2/test-programs/one_func.golden
diff --git a/test-programs/one_func.py b/v1-v2/test-programs/one_func.py
similarity index 100%
rename from test-programs/one_func.py
rename to v1-v2/test-programs/one_func.py
diff --git a/test-programs/open_error.golden b/v1-v2/test-programs/open_error.golden
similarity index 100%
rename from test-programs/open_error.golden
rename to v1-v2/test-programs/open_error.golden
diff --git a/test-programs/open_error.py b/v1-v2/test-programs/open_error.py
similarity index 100%
rename from test-programs/open_error.py
rename to v1-v2/test-programs/open_error.py
diff --git a/test-programs/parse_error.golden b/v1-v2/test-programs/parse_error.golden
similarity index 100%
rename from test-programs/parse_error.golden
rename to v1-v2/test-programs/parse_error.golden
diff --git a/test-programs/parse_error.py b/v1-v2/test-programs/parse_error.py
similarity index 100%
rename from test-programs/parse_error.py
rename to v1-v2/test-programs/parse_error.py
diff --git a/test-programs/parse_error_2.golden b/v1-v2/test-programs/parse_error_2.golden
similarity index 100%
rename from test-programs/parse_error_2.golden
rename to v1-v2/test-programs/parse_error_2.golden
diff --git a/test-programs/parse_error_2.py b/v1-v2/test-programs/parse_error_2.py
similarity index 100%
rename from test-programs/parse_error_2.py
rename to v1-v2/test-programs/parse_error_2.py
diff --git a/test-programs/parse_error_3.golden b/v1-v2/test-programs/parse_error_3.golden
similarity index 100%
rename from test-programs/parse_error_3.golden
rename to v1-v2/test-programs/parse_error_3.golden
diff --git a/test-programs/parse_error_3.py b/v1-v2/test-programs/parse_error_3.py
similarity index 100%
rename from test-programs/parse_error_3.py
rename to v1-v2/test-programs/parse_error_3.py
diff --git a/test-programs/print_builtins_error.golden b/v1-v2/test-programs/print_builtins_error.golden
similarity index 100%
rename from test-programs/print_builtins_error.golden
rename to v1-v2/test-programs/print_builtins_error.golden
diff --git a/test-programs/print_builtins_error.py b/v1-v2/test-programs/print_builtins_error.py
similarity index 100%
rename from test-programs/print_builtins_error.py
rename to v1-v2/test-programs/print_builtins_error.py
diff --git a/test-programs/runtime_error.golden b/v1-v2/test-programs/runtime_error.golden
similarity index 100%
rename from test-programs/runtime_error.golden
rename to v1-v2/test-programs/runtime_error.golden
diff --git a/test-programs/runtime_error.py b/v1-v2/test-programs/runtime_error.py
similarity index 100%
rename from test-programs/runtime_error.py
rename to v1-v2/test-programs/runtime_error.py
diff --git a/test-programs/set_test.golden b/v1-v2/test-programs/set_test.golden
similarity index 100%
rename from test-programs/set_test.golden
rename to v1-v2/test-programs/set_test.golden
diff --git a/test-programs/set_test.py b/v1-v2/test-programs/set_test.py
similarity index 100%
rename from test-programs/set_test.py
rename to v1-v2/test-programs/set_test.py
diff --git a/test-programs/simple.golden b/v1-v2/test-programs/simple.golden
similarity index 100%
rename from test-programs/simple.golden
rename to v1-v2/test-programs/simple.golden
diff --git a/test-programs/simple.py b/v1-v2/test-programs/simple.py
similarity index 100%
rename from test-programs/simple.py
rename to v1-v2/test-programs/simple.py
diff --git a/test-programs/three_lists.golden b/v1-v2/test-programs/three_lists.golden
similarity index 100%
rename from test-programs/three_lists.golden
rename to v1-v2/test-programs/three_lists.golden
diff --git a/test-programs/three_lists.py b/v1-v2/test-programs/three_lists.py
similarity index 100%
rename from test-programs/three_lists.py
rename to v1-v2/test-programs/three_lists.py
diff --git a/test-programs/tuple_test.golden b/v1-v2/test-programs/tuple_test.golden
similarity index 100%
rename from test-programs/tuple_test.golden
rename to v1-v2/test-programs/tuple_test.golden
diff --git a/test-programs/tuple_test.py b/v1-v2/test-programs/tuple_test.py
similarity index 100%
rename from test-programs/tuple_test.py
rename to v1-v2/test-programs/tuple_test.py
diff --git a/test-programs/two_funcs.golden b/v1-v2/test-programs/two_funcs.golden
similarity index 100%
rename from test-programs/two_funcs.golden
rename to v1-v2/test-programs/two_funcs.golden
diff --git a/test-programs/two_funcs.py b/v1-v2/test-programs/two_funcs.py
similarity index 100%
rename from test-programs/two_funcs.py
rename to v1-v2/test-programs/two_funcs.py
diff --git a/tutor.html b/v1-v2/tutor.html
similarity index 76%
rename from tutor.html
rename to v1-v2/tutor.html
index eaa8c4913..6a39233d0 100644
--- a/tutor.html
+++ b/v1-v2/tutor.html
@@ -4,21 +4,28 @@
@@ -45,8 +52,6 @@
-
-
@@ -109,7 +114,7 @@
-Then try some programming questions:
+Then try some sample programming questions:
Solve:
Two-sum |
Reverse list |
@@ -190,15 +195,15 @@
This application supports the core Python 2.5 language, with no
+href="http://docs.python.org/release/2.6/">Python 2.6 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.
Official Python 3 support is coming soon;
-for now, try the Python 3 fork by
-Peter Wentworth.
+for now, try the Python 3 forks by CS Circles and
+Peter Wentworth.
Check out the
-Copyright © 2010-2011 Philip Guo. All rights reserved.
+Copyright © 2010-2012 Philip Guo. All rights reserved.