updated code examples to work on both Python 2 and 3

Philip Guo · Philip Guo · commit 8443a0708442 · 2012-09-03T23:06:03.000-07:00
diff --git a/v3/example-code/aliasing.golden b/v3/example-code/aliasing.golden
@@ -1,5 +1,5 @@
 {
-  "code": "x = [1, 2, 3]\ny = [4, 5, 6]\nz = y\ny = x\nx = z\n\nx = [1, 2, 3] # a different [1, 2, 3] list!\ny = x\nx.append(4)\ny.append(5)\nz = [1, 2, 3, 4, 5] # a different list!\nx.append(6)\ny.append(7)\ny = \"hello\"\n\n\ndef foo(lst):\n    lst.append(\"hello\")\n    bar(lst)\n\ndef bar(myLst):\n    print myLst\n\nfoo(x)\nfoo(z)\n", 
+  "code": "x = [1, 2, 3]\ny = [4, 5, 6]\nz = y\ny = x\nx = z\n\nx = [1, 2, 3] # a different [1, 2, 3] list!\ny = x\nx.append(4)\ny.append(5)\nz = [1, 2, 3, 4, 5] # a different list!\nx.append(6)\ny.append(7)\ny = \"hello\"\n\n\ndef foo(lst):\n    lst.append(\"hello\")\n    bar(lst)\n\ndef bar(myLst):\n    print(myLst)\n\nfoo(x)\nfoo(z)\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/aliasing.txt b/v3/example-code/aliasing.txt
@@ -19,7 +19,7 @@ def foo(lst):
     bar(lst)
 
 def bar(myLst):
-    print myLst
+    print(myLst)
 
 foo(x)
 foo(z)
diff --git a/v3/example-code/closures/lambda-param.golden b/v3/example-code/closures/lambda-param.golden
@@ -1,5 +1,5 @@
 {
-  "code": "def foo(x):\n  bar(lambda y: x + y)\n\ndef bar(a):\n  print a(20)\n\nfoo(10)\n", 
+  "code": "def foo(x):\n  bar(lambda y: x + y)\n\ndef bar(a):\n  print(a(20))\n\nfoo(10)\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/closures/lambda-param.txt b/v3/example-code/closures/lambda-param.txt
@@ -2,6 +2,6 @@ def foo(x):
   bar(lambda y: x + y)
 
 def bar(a):
-  print a(20)
+  print(a(20))
 
 foo(10)
diff --git a/v3/example-code/fact.golden b/v3/example-code/fact.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# dumb recursive factorial\ndef fact(n):\n    if (n <= 1):\n        return 1\n    else:\n        return n * fact(n - 1)\n\nprint fact(6)\n", 
+  "code": "# dumb recursive factorial\ndef fact(n):\n    if (n <= 1):\n        return 1\n    else:\n        return n * fact(n - 1)\n\nprint(fact(6))\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/fact.txt b/v3/example-code/fact.txt
@@ -5,4 +5,4 @@ def fact(n):
     else:
         return n * fact(n - 1)
 
-print fact(6)
+print(fact(6))
diff --git a/v3/example-code/fib.golden b/v3/example-code/fib.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Infinite Fibonacci!!!\n\narr = [1, 1]\n\nprint arr[0]\n\nwhile True:\n    print arr[-1]\n    tmp = sum(arr)\n    arr.append(tmp)\n    del arr[0]\n", 
+  "code": "# Infinite Fibonacci!!!\n\narr = [1, 1]\n\nprint(arr[0])\n\nwhile True:\n    print(arr[-1])\n    tmp = sum(arr)\n    arr.append(tmp)\n    del arr[0]\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/fib.txt b/v3/example-code/fib.txt
@@ -2,10 +2,10 @@
 
 arr = [1, 1]
 
-print arr[0]
+print(arr[0])
 
 while True:
-    print arr[-1]
+    print(arr[-1])
     tmp = sum(arr)
     arr.append(tmp)
     del arr[0]
diff --git a/v3/example-code/filter.golden b/v3/example-code/filter.golden
@@ -1,5 +1,5 @@
 {
-  "code": "input = [(\"Mary\", 27), (\"Joe\", 30), (\"Ruth\", 43), (\"Bob\", 17), (\"Jenny\", 22)]\n\nyoungPeople = []\n\nfor (person, age) in input:\n    if age < 30:\n        youngPeople.append(person)\n    else:\n        print \"HAHA\", person, \"is too old!\"\n\nprint \"There are\", len(youngPeople), \"young people\"\n", 
+  "code": "input = [(\"Mary\", 27), (\"Joe\", 30), (\"Ruth\", 43), (\"Bob\", 17), (\"Jenny\", 22)]\n\nyoungPeople = []\n\nfor (person, age) in input:\n    if age < 30:\n        youngPeople.append(person)\n    else:\n        print(\"HAHA \" + person + \" is too old!\")\n\nprint(\"There are \" + str(len(youngPeople)) + \" young people\")\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/filter.txt b/v3/example-code/filter.txt
@@ -6,6 +6,6 @@ for (person, age) in input:
     if age < 30:
         youngPeople.append(person)
     else:
-        print "HAHA", person, "is too old!"
+        print("HAHA " + person + " is too old!")
 
-print "There are", len(youngPeople), "young people"
+print("There are " + str(len(youngPeople)) + " young people")
diff --git a/v3/example-code/gen_primes.golden b/v3/example-code/gen_primes.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Use generator to generate a stream of primes\ndef gen_primes():\n    n = 2\n    while True:\n        for x in range(2, n):\n            if n % x == 0:\n                break\n        else:\n            yield n\n        n += 1\n\nfor p in gen_primes():\n    print p\n\n", 
+  "code": "# Use generator to generate a stream of primes\ndef gen_primes():\n    n = 2\n    while True:\n        for x in range(2, n):\n            if n % x == 0:\n                break\n        else:\n            yield n\n        n += 1\n\nfor p in gen_primes():\n    print(p)\n\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/gen_primes.txt b/v3/example-code/gen_primes.txt
@@ -10,5 +10,5 @@ def gen_primes():
         n += 1
 
 for p in gen_primes():
-    print p
+    print(p)
 
diff --git a/v3/example-code/ins_sort.golden b/v3/example-code/ins_sort.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# from: http://www.ece.uci.edu/~chou/py02/python.html\ndef InsertionSort(A):\n    for j in range(1, len(A)):\n        key = A[j]\n        i = j - 1\n        while (i >= 0) and (A[i] > key):\n            A[i+1] = A[i]\n            i = i - 1\n        A[i+1] = key\n\ninput = [8, 3, 9, 15, 29, 7, 10]\nInsertionSort(input)\nprint input\n", 
+  "code": "# from: http://www.ece.uci.edu/~chou/py02/python.html\ndef InsertionSort(A):\n    for j in range(1, len(A)):\n        key = A[j]\n        i = j - 1\n        while (i >= 0) and (A[i] > key):\n            A[i+1] = A[i]\n            i = i - 1\n        A[i+1] = key\n\ninput = [8, 3, 9, 15, 29, 7, 10]\nInsertionSort(input)\nprint(input)\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/ins_sort.txt b/v3/example-code/ins_sort.txt
@@ -10,4 +10,4 @@ def InsertionSort(A):
 
 input = [8, 3, 9, 15, 29, 7, 10]
 InsertionSort(input)
-print input
+print(input)
diff --git a/v3/example-code/oop_1.golden b/v3/example-code/oop_1.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Object-oriented programming intro\n# Adapted from MIT 6.01 course notes (Section 3.5)\n# http://mit.edu/6.01/mercurial/spring10/www/handouts/readings.pdf\n\nclass Staff601:\n    course = '6.01'\n    building = 34\n    room = 501\n\n    def salutation(self):\n        return self.role + ' ' + self.name\n\npat = Staff601()\nprint pat.course\n\npat.name = 'Pat'\npat.age = 60\npat.role = 'Professor'\n\nprint pat.building\npat.building = 32\nprint pat.building\n\nprint pat.salutation()\nprint Staff601.salutation(pat)\n", 
+  "code": "# Object-oriented programming intro\n# Adapted from MIT 6.01 course notes (Section 3.5)\n# http://mit.edu/6.01/mercurial/spring10/www/handouts/readings.pdf\n\nclass Staff601:\n    course = '6.01'\n    building = 34\n    room = 501\n\n    def salutation(self):\n        return self.role + ' ' + self.name\n\npat = Staff601()\nprint(pat.course)\n\npat.name = 'Pat'\npat.age = 60\npat.role = 'Professor'\n\nprint(pat.building)\npat.building = 32\nprint(pat.building)\n\nprint(pat.salutation())\nprint(Staff601.salutation(pat))\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/oop_1.txt b/v3/example-code/oop_1.txt
@@ -11,15 +11,15 @@ class Staff601:
         return self.role + ' ' + self.name
 
 pat = Staff601()
-print pat.course
+print(pat.course)
 
 pat.name = 'Pat'
 pat.age = 60
 pat.role = 'Professor'
 
-print pat.building
+print(pat.building)
 pat.building = 32
-print pat.building
+print(pat.building)
 
-print pat.salutation()
-print Staff601.salutation(pat)
+print(pat.salutation())
+print(Staff601.salutation(pat))
diff --git a/v3/example-code/oop_2.golden b/v3/example-code/oop_2.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# The __init__ 'constructor' - object-oriented programming intro\n# Adapted from MIT 6.01 course notes (Section 3.5)\n# http://mit.edu/6.01/mercurial/spring10/www/handouts/readings.pdf\n\nclass Staff601:\n    course = '6.01'\n    building = 34\n    room = 501\n\n    def __init__(self, name, role, years, salary):\n      self.name = name\n      self.role = role\n      self.age = years\n      self.salary = salary\n\n    def salutation(self):\n        return self.role + ' ' + self.name\n\npat = Staff601('Pat', 'Professor', 60, 100000)\nprint pat.salutation()\n\n", 
+  "code": "# The __init__ 'constructor' - object-oriented programming intro\n# Adapted from MIT 6.01 course notes (Section 3.5)\n# http://mit.edu/6.01/mercurial/spring10/www/handouts/readings.pdf\n\nclass Staff601:\n    course = '6.01'\n    building = 34\n    room = 501\n\n    def __init__(self, name, role, years, salary):\n      self.name = name\n      self.role = role\n      self.age = years\n      self.salary = salary\n\n    def salutation(self):\n        return self.role + ' ' + self.name\n\npat = Staff601('Pat', 'Professor', 60, 100000)\nprint(pat.salutation())\n\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/oop_2.txt b/v3/example-code/oop_2.txt
@@ -17,5 +17,5 @@ class Staff601:
         return self.role + ' ' + self.name
 
 pat = Staff601('Pat', 'Professor', 60, 100000)
-print pat.salutation()
+print(pat.salutation())
 
diff --git a/v3/example-code/oop_small.golden b/v3/example-code/oop_small.golden
@@ -1,5 +1,5 @@
 {
-  "code": "class A:\n    x = 1\n    y = 'hello'\n\nclass B:\n    z = 'bye'\n\nclass C(A,B):\n    def salutation(self):\n        return '%d %s %s' % (self.x, self.y, self.z)\n\ninst = C()\nprint inst.salutation()\ninst.x = 100\nprint inst.salutation()\n", 
+  "code": "class A:\n    x = 1\n    y = 'hello'\n\nclass B:\n    z = 'bye'\n\nclass C(A,B):\n    def salutation(self):\n        return '%d %s %s' % (self.x, self.y, self.z)\n\ninst = C()\nprint(inst.salutation())\ninst.x = 100\nprint(inst.salutation())\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/oop_small.txt b/v3/example-code/oop_small.txt
@@ -10,6 +10,6 @@ class C(A,B):
         return '%d %s %s' % (self.x, self.y, self.z)
 
 inst = C()
-print inst.salutation()
+print(inst.salutation())
 inst.x = 100
-print inst.salutation()
+print(inst.salutation())
diff --git a/v3/example-code/py_tutorial.golden b/v3/example-code/py_tutorial.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Philip's 10-minute intro to Python\n\n# numbers!\nage = 26\npi = 3.14159\n\n# strings!\ns = 'Rutherford Birchard Hayes'\ntokens = s.split()\nfirstName = tokens[0]\nmiddleName = tokens[1]\nlastName = tokens[2]\ns2 = firstName + ' ' + middleName + ' ' + lastName\n\n# 'if' statement - indentation matters!\nif (s == s2):\n    print 'yes!!!'\nelse:\n    print 'nooooooo'\n\n# list (mutable sequence)\nbeatles = ['John', 'Paul', 'George']\nbeatles.append('Ringo')\n\n# 'for' loop - indentation matters!\nfor b in beatles:\n    print 'Hello', b\n\n# tuple (immutable sequence)\nages = (18, 21, 28, 21, 22, 18, 19, 34, 9)\n\n# set (no order, no duplicates)\nuniqueAges = set(ages)\nuniqueAges.add(18) # already in set, no effect\nuniqueAges.remove(21)\n\n# no guaranteed order when iterating over a set\nfor thisAge in uniqueAges:\n    print thisAge\n\n# testing set membership\nif 18 in uniqueAges:\n    print 'There is an 18-year-old present!'\n\n# sorting\nbeatles.sort() # in-place\norderedUniqueAges = sorted(uniqueAges) # new list\n\n# dict - mapping unique keys to values\nnetWorth = {}\nnetWorth['Donald Trump'] = 3000000000\nnetWorth['Bill Gates'] = 58000000000\nnetWorth['Tom Cruise'] = 40000000\nnetWorth['Joe Postdoc'] = 20000\n\n# iterating over key-value pairs:\nfor (person, worth) in netWorth.iteritems():\n    if worth < 1000000:\n        print 'haha', person, 'is not a millionaire'\n\n# testing dict membership\nif 'Tom Cruise' in netWorth:\n    print 'show me the money!'\n", 
+  "code": "# Philip's 10-minute intro to Python\n\n# numbers!\nage = 26\npi = 3.14159\n\n# strings!\ns = 'Rutherford Birchard Hayes'\ntokens = s.split()\nfirstName = tokens[0]\nmiddleName = tokens[1]\nlastName = tokens[2]\ns2 = firstName + ' ' + middleName + ' ' + lastName\n\n# 'if' statement - indentation matters!\nif (s == s2):\n    print('yes!!!')\nelse:\n    print('nooooooo')\n\n# list (mutable sequence)\nbeatles = ['John', 'Paul', 'George']\nbeatles.append('Ringo')\n\n# 'for' loop - indentation matters!\nfor b in beatles:\n    print('Hello ' + b)\n\n# tuple (immutable sequence)\nages = (18, 21, 28, 21, 22, 18, 19, 34, 9)\n\n# set (no order, no duplicates)\nuniqueAges = set(ages)\nuniqueAges.add(18) # already in set, no effect\nuniqueAges.remove(21)\n\n# no guaranteed order when iterating over a set\nfor thisAge in uniqueAges:\n    print(thisAge)\n\n# testing set membership\nif 18 in uniqueAges:\n    print('There is an 18-year-old present!')\n\n# sorting\nbeatles.sort() # in-place\norderedUniqueAges = sorted(uniqueAges) # new list\n\n# dict - mapping unique keys to values\nnetWorth = {}\nnetWorth['Donald Trump'] = 3000000000\nnetWorth['Bill Gates'] = 58000000000\nnetWorth['Tom Cruise'] = 40000000\nnetWorth['Joe Postdoc'] = 20000\n\n# iterating over key-value pairs:\nfor (person, worth) in netWorth.items():\n    if worth < 1000000:\n        print('haha ' + person + ' is not a millionaire')\n\n# testing dict membership\nif 'Tom Cruise' in netWorth:\n    print('show me the money!')\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/py_tutorial.txt b/v3/example-code/py_tutorial.txt
@@ -14,17 +14,17 @@ s2 = firstName + ' ' + middleName + ' ' + lastName
 
 # 'if' statement - indentation matters!
 if (s == s2):
-    print 'yes!!!'
+    print('yes!!!')
 else:
-    print 'nooooooo'
+    print('nooooooo')
 
 # list (mutable sequence)
 beatles = ['John', 'Paul', 'George']
 beatles.append('Ringo')
 
 # 'for' loop - indentation matters!
 for b in beatles:
-    print 'Hello', b
+    print('Hello ' + b)
 
 # tuple (immutable sequence)
 ages = (18, 21, 28, 21, 22, 18, 19, 34, 9)
@@ -36,11 +36,11 @@ uniqueAges.remove(21)
 
 # no guaranteed order when iterating over a set
 for thisAge in uniqueAges:
-    print thisAge
+    print(thisAge)
 
 # testing set membership
 if 18 in uniqueAges:
-    print 'There is an 18-year-old present!'
+    print('There is an 18-year-old present!')
 
 # sorting
 beatles.sort() # in-place
@@ -54,10 +54,10 @@ netWorth['Tom Cruise'] = 40000000
 netWorth['Joe Postdoc'] = 20000
 
 # iterating over key-value pairs:
-for (person, worth) in netWorth.iteritems():
+for (person, worth) in netWorth.items():
     if worth < 1000000:
-        print 'haha', person, 'is not a millionaire'
+        print('haha ' + person + ' is not a millionaire')
 
 # testing dict membership
 if 'Tom Cruise' in netWorth:
-    print 'show me the money!'
+    print('show me the money!')
diff --git a/v3/example-code/strtok.golden b/v3/example-code/strtok.golden
@@ -1,5 +1,5 @@
 {
-  "code": "input = 'John,Doe,1984,4,1,male'\n\ntokens = input.split(',')\nfirstName = tokens[0]\nlastName = tokens[1]\nbirthdate = (int(tokens[2]), int(tokens[3]), int(tokens[4]))\nisMale = (tokens[5] == 'male')\n\nprint 'Hi', firstName, lastName\n", 
+  "code": "input = 'John,Doe,1984,4,1,male'\n\ntokens = input.split(',')\nfirstName = tokens[0]\nlastName = tokens[1]\nbirthdate = (int(tokens[2]), int(tokens[3]), int(tokens[4]))\nisMale = (tokens[5] == 'male')\n\nprint('Hi ' + firstName + ' ' + lastName)\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/strtok.txt b/v3/example-code/strtok.txt
@@ -6,4 +6,4 @@ lastName = tokens[1]
 birthdate = (int(tokens[2]), int(tokens[3]), int(tokens[4]))
 isMale = (tokens[5] == 'male')
 
-print 'Hi', firstName, lastName
+print('Hi ' + firstName + ' ' + lastName)
diff --git a/v3/example-code/sum.golden b/v3/example-code/sum.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Higher-order functions\n# Adapted from MIT 6.01 course notes (Section A.2.2)\n# http://mit.edu/6.01/mercurial/spring10/www/handouts/readings.pdf\n\ndef summation(low, high, f, next):\n    s = 0\n    x = low\n    while x <= high:\n        s = s + f(x)\n        x = next(x)\n    return s\n\ndef sumsquares(low, high):\n    return summation(low, high, lambda x: x**2, lambda x: x+1)\n\nprint sumsquares(1, 10)\n", 
+  "code": "# Higher-order functions\n# Adapted from MIT 6.01 course notes (Section A.2.2)\n# http://mit.edu/6.01/mercurial/spring10/www/handouts/readings.pdf\n\ndef summation(low, high, f, next):\n    s = 0\n    x = low\n    while x <= high:\n        s = s + f(x)\n        x = next(x)\n    return s\n\ndef sumsquares(low, high):\n    return summation(low, high, lambda x: x**2, lambda x: x+1)\n\nprint(sumsquares(1, 10))\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/sum.txt b/v3/example-code/sum.txt
@@ -13,4 +13,4 @@ def summation(low, high, f, next):
 def sumsquares(low, high):
     return summation(low, high, lambda x: x**2, lambda x: x+1)
 
-print sumsquares(1, 10)
+print(sumsquares(1, 10))
diff --git a/v3/example-code/wentworth_gcd.golden b/v3/example-code/wentworth_gcd.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Tutorial code from Prof. Peter Wentworth\n# Rhodes University, South Africa (http://www.ru.ac.za/)\n\ndef gcd(x, y, depth=1):\n    '''\n    Find the greatest common divisor of x, y\n    Pre:  x >= y,  y >= 0, both x and y are int\n    '''\n    result = x       # set provisional return value\n    if y != 0:\n        indent = \"**\" * depth\n        print(\"%s About to recursively call gcd(%d, %d)\" % (indent, y, x%y))\n        result = gcd(y, x % y, depth+1)\n        print(\"%s result is %d\" % (indent, result))\n    return result\n\ndef main():\n    m = 77\n    n = 28\n    print(\"Finding gcd(%d, %d)\" % (m,n))\n    g = gcd(m, n)\n    print('Greatest common divisor of %d, %d = %d'\n          % (m, n, g))\n\nmain()\n\n", 
+  "code": "# Tutorial code from Prof. Peter Wentworth\n# Rhodes University, South Africa (http://www.ru.ac.za/)\n\ndef gcd(x, y, depth=1):\n    '''\n    Find the greatest common divisor of x, y\n    Pre:  x >= y,  y >= 0, both x and y are int\n    '''\n    result = x       # set provisional return value\n    if y != 0:\n        indent = \"**\" * depth\n        print((\"%s About to recursively call gcd(%d, %d)\" % (indent, y, x%y)))\n        result = gcd(y, x % y, depth+1)\n        print((\"%s result is %d\" % (indent, result)))\n    return result\n\ndef main():\n    m = 77\n    n = 28\n    print((\"Finding gcd(%d, %d)\" % (m,n)))\n    g = gcd(m, n)\n    print(('Greatest common divisor of %d, %d = %d'\n          % (m, n, g)))\n\nmain()\n\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/wentworth_gcd.txt b/v3/example-code/wentworth_gcd.txt
@@ -9,18 +9,18 @@ def gcd(x, y, depth=1):
     result = x       # set provisional return value
     if y != 0:
         indent = "**" * depth
-        print("%s About to recursively call gcd(%d, %d)" % (indent, y, x%y))
+        print(("%s About to recursively call gcd(%d, %d)" % (indent, y, x%y)))
         result = gcd(y, x % y, depth+1)
-        print("%s result is %d" % (indent, result))
+        print(("%s result is %d" % (indent, result)))
     return result
 
 def main():
     m = 77
     n = 28
-    print("Finding gcd(%d, %d)" % (m,n))
+    print(("Finding gcd(%d, %d)" % (m,n)))
     g = gcd(m, n)
-    print('Greatest common divisor of %d, %d = %d'
-          % (m, n, g))
+    print(('Greatest common divisor of %d, %d = %d'
+          % (m, n, g)))
 
 main()
 
diff --git a/v3/example-code/wentworth_sumList.golden b/v3/example-code/wentworth_sumList.golden
@@ -1,5 +1,5 @@
 {
-  "code": "# Tutorial code from Prof. Peter Wentworth\n# Rhodes University, South Africa (http://www.ru.ac.za/)\n\ndef sumList(xs):\n    '''\n    Sum a list that can contain nested lists.\n    Precondition: All leaf elements are numbers.\n    '''\n    sum = 0\n    for e in xs:\n        if type(e) is list:\n            print(\"Calling sumList(%s) recursively\" % e)\n            v = sumList(e)\n            print(\"sumList(%s) returned %s\" % (e, v))\n            sum += v\n        else:\n            sum += e\n    return sum\n\n\ntestData = [10, [20, 30, [40], 50], 60]\nprint(\"Calling sumList(%s)\" % testData)\nresult = sumList(testData)\nprint(\"Final sum of all numbers in initial list is %s\" % result)\n\n", 
+  "code": "# Tutorial code from Prof. Peter Wentworth\n# Rhodes University, South Africa (http://www.ru.ac.za/)\n\ndef sumList(xs):\n    '''\n    Sum a list that can contain nested lists.\n    Precondition: All leaf elements are numbers.\n    '''\n    sum = 0\n    for e in xs:\n        if type(e) is list:\n            print((\"Calling sumList(%s) recursively\" % e))\n            v = sumList(e)\n            print((\"sumList(%s) returned %s\" % (e, v)))\n            sum += v\n        else:\n            sum += e\n    return sum\n\n\ntestData = [10, [20, 30, [40], 50], 60]\nprint((\"Calling sumList(%s)\" % testData))\nresult = sumList(testData)\nprint((\"Final sum of all numbers in initial list is %s\" % result))\n\n", 
   "trace": [
     {
       "ordered_globals": [], 
diff --git a/v3/example-code/wentworth_sumList.txt b/v3/example-code/wentworth_sumList.txt
@@ -9,17 +9,17 @@ def sumList(xs):
     sum = 0
     for e in xs:
         if type(e) is list:
-            print("Calling sumList(%s) recursively" % e)
+            print(("Calling sumList(%s) recursively" % e))
             v = sumList(e)
-            print("sumList(%s) returned %s" % (e, v))
+            print(("sumList(%s) returned %s" % (e, v)))
             sum += v
         else:
             sum += e
     return sum
 
 
 testData = [10, [20, 30, [40], 50], 60]
-print("Calling sumList(%s)" % testData)
+print(("Calling sumList(%s)" % testData))
 result = sumList(testData)
-print("Final sum of all numbers in initial list is %s" % result)
+print(("Final sum of all numbers in initial list is %s" % result))
 
diff --git a/v3/example-code/wentworth_try_finally.golden b/v3/example-code/wentworth_try_finally.golden
diff --git a/v3/example-code/wentworth_try_finally.txt b/v3/example-code/wentworth_try_finally.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "code": "x = [1, 2, 3]\ny = [4, 5, 6]\nz = y\ny = x\nx = z\n\nx = [1, 2, 3] # a different [1, 2, 3] list!\ny = x\nx.append(4)\ny.append(5)\nz = [1, 2, 3, 4, 5] # a different list!\nx.append(6)\ny.append(7)\ny = \"hello\"\n\n\ndef foo(lst):\n lst.append(\"hello\")\n bar(lst)\n\ndef bar(myLst):\n print myLst\n\nfoo(x)\nfoo(z)\n",`
	`2`	`+ "code": "x = [1, 2, 3]\ny = [4, 5, 6]\nz = y\ny = x\nx = z\n\nx = [1, 2, 3] # a different [1, 2, 3] list!\ny = x\nx.append(4)\ny.append(5)\nz = [1, 2, 3, 4, 5] # a different list!\nx.append(6)\ny.append(7)\ny = \"hello\"\n\n\ndef foo(lst):\n lst.append(\"hello\")\n bar(lst)\n\ndef bar(myLst):\n print(myLst)\n\nfoo(x)\nfoo(z)\n",`
`3`	`3`	`"trace": [`
`4`	`4`	`{`
`5`	`5`	`"ordered_globals": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "code": "def foo(x):\n bar(lambda y: x + y)\n\ndef bar(a):\n print a(20)\n\nfoo(10)\n",`
	`2`	`+ "code": "def foo(x):\n bar(lambda y: x + y)\n\ndef bar(a):\n print(a(20))\n\nfoo(10)\n",`
`3`	`3`	`"trace": [`
`4`	`4`	`{`
`5`	`5`	`"ordered_globals": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "code": "# dumb recursive factorial\ndef fact(n):\n if (n <= 1):\n return 1\n else:\n return n * fact(n - 1)\n\nprint fact(6)\n",`
	`2`	`+ "code": "# dumb recursive factorial\ndef fact(n):\n if (n <= 1):\n return 1\n else:\n return n * fact(n - 1)\n\nprint(fact(6))\n",`
`3`	`3`	`"trace": [`
`4`	`4`	`{`
`5`	`5`	`"ordered_globals": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "code": "# Infinite Fibonacci!!!\n\narr = [1, 1]\n\nprint arr[0]\n\nwhile True:\n print arr[-1]\n tmp = sum(arr)\n arr.append(tmp)\n del arr[0]\n",`
	`2`	`+ "code": "# Infinite Fibonacci!!!\n\narr = [1, 1]\n\nprint(arr[0])\n\nwhile True:\n print(arr[-1])\n tmp = sum(arr)\n arr.append(tmp)\n del arr[0]\n",`
`3`	`3`	`"trace": [`
`4`	`4`	`{`
`5`	`5`	`"ordered_globals": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "code": "input = [(\"Mary\", 27), (\"Joe\", 30), (\"Ruth\", 43), (\"Bob\", 17), (\"Jenny\", 22)]\n\nyoungPeople = []\n\nfor (person, age) in input:\n if age < 30:\n youngPeople.append(person)\n else:\n print \"HAHA\", person, \"is too old!\"\n\nprint \"There are\", len(youngPeople), \"young people\"\n",`
	`2`	`+ "code": "input = [(\"Mary\", 27), (\"Joe\", 30), (\"Ruth\", 43), (\"Bob\", 17), (\"Jenny\", 22)]\n\nyoungPeople = []\n\nfor (person, age) in input:\n if age < 30:\n youngPeople.append(person)\n else:\n print(\"HAHA \" + person + \" is too old!\")\n\nprint(\"There are \" + str(len(youngPeople)) + \" young people\")\n",`
`3`	`3`	`"trace": [`
`4`	`4`	`{`
`5`	`5`	`"ordered_globals": [],`