[beam] branch master updated: [BEAM-4752] Add dill compatibility for older versions of dill (#5949)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

altay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ca320c  [BEAM-4752] Add dill compatibility for older versions of dill (#5949)
2ca320c is described below

commit 2ca320cc4265d2bdc8b678579b01597cea3cd837
Author: Ahmet Altay <aa...@gmail.com>
AuthorDate: Fri Jul 13 15:40:39 2018 -0700

    [BEAM-4752] Add dill compatibility for older versions of dill (#5949)
    
    * Add dill compatibility for older versions of dill
---
 sdks/python/apache_beam/internal/pickler.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdks/python/apache_beam/internal/pickler.py b/sdks/python/apache_beam/internal/pickler.py
index a4d20b9..211430b 100644
--- a/sdks/python/apache_beam/internal/pickler.py
+++ b/sdks/python/apache_beam/internal/pickler.py
@@ -44,6 +44,12 @@ import dill
 # TODO: Remove this once Beam depends on dill >= 0.2.8
 if not getattr(dill, 'dill', None):
   dill.dill = dill._dill
+  sys.modules['dill.dill'] = dill._dill
+
+# TODO: Remove once Dataflow has containers with a preinstalled dill >= 0.2.8
+if not getattr(dill, '_dill', None):
+  dill._dill = dill.dill
+  sys.modules['dill._dill'] = dill.dill
 
 
 def _is_nested_class(cls):