From 1d743e10ed544e02f24dec1b7567a4fe8bb03b7a Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Sun, 10 Aug 2014 05:55:18 +0900 Subject: [PATCH 1/2] Modified serializers.py for Python 2.6 --- python/pyspark/serializers.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python/pyspark/serializers.py b/python/pyspark/serializers.py index b35558db3e007..e119f771659b1 100644 --- a/python/pyspark/serializers.py +++ b/python/pyspark/serializers.py @@ -314,9 +314,14 @@ def _copy_func(f): _old_namedtuple = _copy_func(collections.namedtuple) - def namedtuple(name, fields, verbose=False, rename=False): - cls = _old_namedtuple(name, fields, verbose, rename) - return _hack_namedtuple(cls) + if sys.version_info[0:2] == (2, 6): + def namedtuple(name, fields, verbose=False): + cls = _old_namedtuple(name, fields, verbose) + return _hack_namedtuple(cls) + else: + def namedtuple(name, fields, verbose=False, rename=False): + cls = _old_namedtuple(name, fields, verbose, rename) + return _hack_namedtuple(cls) # replace namedtuple with new one collections.namedtuple.func_globals["_old_namedtuple"] = _old_namedtuple From 667da1e518b2caaa3558b2cd98bfb416d2a9b3df Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Sun, 10 Aug 2014 06:03:18 +0900 Subject: [PATCH 2/2] Modified indentation in serializers.py --- python/pyspark/serializers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/pyspark/serializers.py b/python/pyspark/serializers.py index e119f771659b1..f566f3505ce74 100644 --- a/python/pyspark/serializers.py +++ b/python/pyspark/serializers.py @@ -315,13 +315,13 @@ def _copy_func(f): _old_namedtuple = _copy_func(collections.namedtuple) if sys.version_info[0:2] == (2, 6): - def namedtuple(name, fields, verbose=False): - cls = _old_namedtuple(name, fields, verbose) - return _hack_namedtuple(cls) + def namedtuple(name, fields, verbose=False): + cls = _old_namedtuple(name, fields, verbose) + return _hack_namedtuple(cls) else: - def namedtuple(name, fields, verbose=False, rename=False): - cls = _old_namedtuple(name, fields, verbose, rename) - return _hack_namedtuple(cls) + def namedtuple(name, fields, verbose=False, rename=False): + cls = _old_namedtuple(name, fields, verbose, rename) + return _hack_namedtuple(cls) # replace namedtuple with new one collections.namedtuple.func_globals["_old_namedtuple"] = _old_namedtuple