From eb4fa533284f6f072cbafc6ded5e622374f4b7bf Mon Sep 17 00:00:00 2001 From: Davies Liu Date: Sat, 18 Apr 2015 21:49:04 -0700 Subject: [PATCH] fix tests in python 3 --- python/pyspark/java_gateway.py | 6 +++++- python/pyspark/sql/tests.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py index 1b6a7e9bb9d26..3cee4ea6e3a35 100644 --- a/python/pyspark/java_gateway.py +++ b/python/pyspark/java_gateway.py @@ -17,6 +17,7 @@ import atexit import os +import sys import select import signal import shlex @@ -24,6 +25,9 @@ import platform from subprocess import Popen, PIPE +if sys.version >= '3': + xrange = range + from py4j.java_gateway import java_import, JavaGateway, GatewayClient from py4j.java_collections import ListConverter @@ -32,7 +36,7 @@ # patching ListConverter, or it will convert bytearray into Java ArrayList def can_convert_list(self, obj): - return isinstance(obj, (list, tuple)) + return isinstance(obj, (list, tuple, xrange)) ListConverter.can_convert = can_convert_list diff --git a/python/pyspark/sql/tests.py b/python/pyspark/sql/tests.py index 60cfb8ef3dc66..23e84283679e1 100644 --- a/python/pyspark/sql/tests.py +++ b/python/pyspark/sql/tests.py @@ -466,7 +466,7 @@ def test_infer_long_type(self): self.assertEqual(_infer_type(2**71), LongType()) def test_filter_with_datetime(self): - time = datetime.datetime(2015, 4, 17, 23, 01, 02, 3000) + time = datetime.datetime(2015, 4, 17, 23, 1, 2, 3000) date = time.date() row = Row(date=date, time=time) df = self.sqlCtx.createDataFrame([row])