Make compatible with Python3

README.md

@@ -47,10 +47,7 @@ as "say". In some cases, you'll want to build a class object directly such as in
 
 ## Note on Python versions
 
-This module is for python 2.x and requires python 2.5 or higher.  
-There is a separate version available for python 3.x at:
-
-      http://github.com/tropo/python-webapi/tree/python3
+This module is for Python 3 and 2.5 or higher.  
 
 ## License
 

build/lib/tropo.py

@@ -31,6 +31,8 @@
 
 """
 
+from __future__ import print_function
+
 try:
     import cjson as jsonlib
     jsonlib.dumps = jsonlib.encode

samples/gh-12-test_voice.py

@@ -8,6 +8,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session, TropoAction, Choices
 
@@ -35,7 +37,7 @@ def index(request):
 
 
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 

samples/gh-14.test_call.py

@@ -9,6 +9,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 
@@ -23,7 +25,7 @@ def index(request):
     t.call(to='tel:+' + TO_NUMBER, _from='tel:+' + FROM_NUMBER)
     t.say('This is your mother. Did you brush your teeth today?')
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 

samples/gh-14.test_message.py

@@ -9,6 +9,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 
@@ -20,9 +22,9 @@
 def index(request):
         t = Tropo()
         t.message("Hello World", TO_NUMBER, channel='VOICE', _from='tel:+' + FROM_NUMBER)
-	json = t.RenderJson()
-	print json
-	return json
+        json = t.RenderJson()
+        print(json)
+        return json
 #retest
 
 

samples/gh-14.test_say.py

@@ -8,6 +8,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 
@@ -17,7 +19,7 @@ def index(request):
     t = Tropo()
     t.say('12345', _as='DIGITS', voice='dave')
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 

samples/gh-14.test_transfer.py

@@ -10,6 +10,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 
@@ -25,7 +27,7 @@ def index(request):
     t.transfer(TO_NUMBER, _from="tel:+" + FROM_NUMBER)
     t.say("Hi. I am a robot")
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 

samples/gh-14_test.py

@@ -5,6 +5,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 
@@ -14,7 +16,7 @@ def index(request):
     t = Tropo()
     t.say('12345', _as='DIGITS', voice='allison')
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 run_itty()

samples/gh-17.test.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Result
 
@@ -11,7 +13,7 @@ def index(request):
 	t.on(event = "continue", next ="/continue")
 	t.on(event = "incomplete", next ="/incomplete")
 	json = t.RenderJson()
-	print json
+	print(json)
 	return json
 
 @post("/continue")
@@ -29,15 +31,15 @@ def index(request):
 		t.say("What are you waiting for?")
 
 	json = t.RenderJson()
-	print json
+	print(json)
 	return json
 
 @post("/incomplete")
 def index(request):
 	t = Tropo()
 	t.say("Sorry, that wasn't on of the options.")
 	json = t.RenderJson()
-	print json
+	print(json)
 	return json
 
 run_itty()

samples/gh-20-test_ask.py

@@ -6,6 +6,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session, Result
 
@@ -19,16 +21,16 @@ def index(request):
 
 	t.on(event = "continue", next ="/continue")
 
-        json = t.RenderJson()
+	json = t.RenderJson()
 
-        print json
+	print(json)
 	return json
 
 @post("/continue")
 def index(request):
 
 	r = Result(request.body)        
-        print "Result : %s" % r
+	print("Result : %s" % r)
 
 	t = Tropo()
 
@@ -37,8 +39,8 @@ def index(request):
 
 	t.say("You said " + answer + ", which is a " + value)
 
-        json = t.RenderJson()
-        print json
+	json = t.RenderJson()
+	print(json)
 	return json
 
 run_itty()

samples/gh-21.choices.py

@@ -11,6 +11,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session, Result, Choices
 
@@ -20,21 +22,21 @@ def index(request):
 
 	t = Tropo()
 
-        choices = Choices("[4-5 DIGITS]", mode="dtmf", terminator = "#")
+	choices = Choices("[4-5 DIGITS]", mode="dtmf", terminator = "#")
 	t.ask(choices, timeout=15, name="digit", say = "What's your four or five digit pin? Press pound when finished.")
 
 	t.on(event = "continue", next ="/continue")
 
-        json = t.RenderJson()
+	json = t.RenderJson()
 
-        print json
+	print(json)
 	return json
 
 @post("/continue")
 def index(request):
 
 	r = Result(request.body)        
-        print "Result : %s" % r
+        print("Result : %s" % r)
 #        dump(r)
 	t = Tropo()
 
@@ -43,8 +45,8 @@ def index(request):
 	t.say("You said ")
 	t.say (answer, _as="DIGITS")
 
-        json = t.RenderJson()
-        print json
+	json = t.RenderJson()
+	print(json)
 	return json
 
 run_itty()

samples/gh-22.transfer.py

@@ -9,6 +9,7 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
 
 from itty import *
 from tropo-webapi-python/tropo import Tropo, Session
@@ -30,7 +31,7 @@ def index(request):
   t.transfer(TO_NUMBER, headers={"x-callername":"Kevin Bond"})
 
   json = t.RenderJson()
-  print json
+  print(json)
   return json
 
 

samples/gh-23.ask_timeout.py

@@ -1,6 +1,7 @@
 # tests example clarifying gh-23 . How to use timeout, and nomatch parameters
 # in "say" within "ask"
 
+from __future__ import print_function
 
 from itty import *
 from tropo import Tropo, Session, Result
@@ -25,7 +26,7 @@ def index (request):
                  ])   
 
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 
@@ -67,7 +68,7 @@ def index_straight_json (request):
 
 }
 """
-    print json
+    print(json)
     return json
 
 

samples/gh-5.hello_cgi.py

@@ -16,21 +16,23 @@
 #   3. Place this file in examples folder and chmod it executable
 #   4. Dial up Tropo app, and hear "Hello, World ..."
 
+from __future__ import print_function
+
 import cgi
 from tropo import Tropo
 
 def hello():
     t = Tropo()
     t.say(['hello world! I am a C G I script.'])
     json = t.RenderJson()
-    print json
+    print(json)
     return json
 
 
 
-print "Content-type: text/json"
-print
-print 
+print("Content-type: text/json")
+print()
+print()
 
 hello()
 

samples/itty_hello_world.py

@@ -3,6 +3,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 

samples/itty_session_api.py

@@ -9,6 +9,8 @@
 # Sample application using the itty-bitty python web framework from:
 #  http://github.com/toastdriven/itty
 
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session
 from urllib import urlencode

samples/record_test.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from itty import *
 from tropo import Tropo, Session, Result
 
@@ -11,4 +13,4 @@ def index(request):
 
     return t.RenderJson()
 
-run_itty(server='wsgiref', port=8888)
+run_itty(server='wsgiref', port=8888)