Merge branch 'SPARK-32094-update-cloudpickle' of https://github.com/c…

…odesue/spark into SPARK-32094-update-cloudpickle
apache · Jul 14, 2020 · d731f63 · d731f63
2 parents fb5ecca + 23933eb
commit d731f63
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
@@ -124,3 +124,4 @@ SessionHandler.java
 GangliaReporter.java
 application_1578436911597_0052
 config.properties
+cloudpickle_fast.py
diff --git a/python/pyspark/cloudpickle.py b/python/pyspark/cloudpickle.py
@@ -1381,4 +1381,4 @@ def _get_bases(typ):
     else:
         # For regular class objects
         bases_attr = '__bases__'
-    return getattr(typ, bases_attr)
+    return getattr(typ, bases_attr)
diff --git a/python/pyspark/cloudpickle_fast.py b/python/pyspark/cloudpickle_fast.py
@@ -554,4 +554,4 @@ def dump(self, obj):
                 )
                 raise pickle.PicklingError(msg)
             else:
-                raise
+                raise