From 997764750a5d5ef1a501643fff8529f913c74ef8 Mon Sep 17 00:00:00 2001 From: Ahmet Altay Date: Wed, 13 Jul 2016 10:18:03 -0700 Subject: [PATCH] Temporarily reverting pickler changes (@4e2d8ab). It is causing infinite recursion when some tests are directly invoked outside the testing framework. Added one such test to tox tests for testing failing case (directly by main function). --- sdks/python/apache_beam/internal/pickler.py | 18 ------------------ sdks/python/tox.ini | 1 + 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/sdks/python/apache_beam/internal/pickler.py b/sdks/python/apache_beam/internal/pickler.py index f427aa5eac46..898e04b9a898 100644 --- a/sdks/python/apache_beam/internal/pickler.py +++ b/sdks/python/apache_beam/internal/pickler.py @@ -159,24 +159,6 @@ def new_save_module_dict(pickler, obj): return old_save_module_dict(pickler, obj) dill.dill.save_module_dict = new_save_module_dict - - old_save_function = dill.dill.save_function - - @dill.dill.register(types.FunctionType) - def new_save_function(pickler, obj): - globs = obj.__globals__ if dill.dill.PY3 else obj.func_globals - if (dill.dill.is_dill(pickler) and globs == pickler._main.__dict__ - and not pickler._recurse): - try: - pickler._recurse = True - return old_save_function(pickler, obj) - finally: - pickler._recurse = False - else: - return old_save_function(pickler, obj) - dill.dill.save_function = new_save_function - - def _nest_dill_logging(): """Prefix all dill logging with its depth in the callstack. diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini index 29674ed773da..5a2572ed1812 100644 --- a/sdks/python/tox.ini +++ b/sdks/python/tox.ini @@ -31,6 +31,7 @@ deps= pep8 pylint commands = + python apache_beam/examples/complete/autocomplete_test.py python setup.py test {toxinidir}/run_pylint.sh passenv = TRAVIS*