manually adapt few imports

gluon/restricted.py

@@ -10,10 +10,7 @@ Restricted environment to execute application's code
 """
 
 import sys
-try:
-    import cPickle as pickle
-except:
-    import pickle
+from gluon._compat import pickle
 import traceback
 import types
 import os
@@ -224,7 +221,7 @@ def restricted(code, environment=None, layer='Unknown'):
             ccode = code
         else:
             ccode = compile2(code, layer)
-        exec ccode in environment
+        exec (ccode) in environment
     except HTTP:
         raise
     except RestrictedError:
@@ -252,7 +249,7 @@ def snapshot(info=None, context=5, code=None, environment=None):
     # if no exception info given, get current:
     etype, evalue, etb = info or sys.exc_info()
 
-    if isinstance(etype, types.ClassType):
+    if isinstance(etype, type):
         etype = etype.__name__
 
     # create a snapshot dict with some basic information