fixed 1820:uncaught pickling error with shell and app engine, thanks Alan

2013-12-17 16:43:07 -06:00
parent a4416bd11f
commit 38de99fc9c
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.8.2-stable+timestamp.2013.12.17.16.39.21
+Version 2.8.2-stable+timestamp.2013.12.17.16.41.58
--- a/gluon/contrib/shell.py
+++ b/gluon/contrib/shell.py
@@ -258,7 +258,7 @@ def run(history, statement, env={}):
                if not name.startswith('__'):
                    try:
                        history.set_global(name, val)
-                    except TypeError, ex:
+                    except (TypeError, cPickle.PicklingError), ex:
                        UNPICKLABLE_TYPES.append(type(val))
                        history.add_unpicklable(statement, new_globals.keys())