fix tests in python 3

apache · Apr 19, 2015 · eb4fa53 · eb4fa53
1 parent d17d634
commit eb4fa53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py
@@ -17,13 +17,17 @@
 
 import atexit
 import os
+import sys
 import select
 import signal
 import shlex
 import socket
 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
@@ -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])