From 38de99fc9cefe0a4f7faaaba3fe710975fc261ad Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 17 Dec 2013 16:43:07 -0600 Subject: [PATCH] fixed 1820:uncaught pickling error with shell and app engine, thanks Alan --- VERSION | 2 +- gluon/contrib/shell.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 946fe36c..5e4667b0 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/contrib/shell.py b/gluon/contrib/shell.py index 4d206036..0a224100 100755 --- 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())