wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-28 03:50:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade six to 1.0.0 (#4180)

Browse Source
This commit is contained in:
Yuhong Guo
2019-02-28 05:05:25 +08:00
committed by Philipp Moritz
parent 0a11b27971
commit 41b81af11b
3 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/function_manager.py
+7 -7
View File
@@ -7,7 +7,6 @@ import importlib
import inspect
import json
import logging
import six
import sys
import time
import traceback
@@ -27,6 +26,7 @@ from ray.utils import (
is_class_method,
check_oversized_pickle,
decode,
ensure_str,
format_error_message,
push_error_to_driver,
)
@@ -89,9 +89,9 @@ class FunctionDescriptor(object):
return FunctionDescriptor.for_driver_task()
elif (len(function_descriptor_list) == 3
or len(function_descriptor_list) == 4):
module_name = six.ensure_str(function_descriptor_list[0])
class_name = six.ensure_str(function_descriptor_list[1])
function_name = six.ensure_str(function_descriptor_list[2])
module_name = ensure_str(function_descriptor_list[0])
class_name = ensure_str(function_descriptor_list[1])
function_name = ensure_str(function_descriptor_list[2])
if len(function_descriptor_list) == 4:
return cls(module_name, function_name, class_name,
function_descriptor_list[3])
@@ -709,10 +709,10 @@ class FunctionActorManager(object):
"actor_method_names"
])
class_name = six.ensure_str(class_name)
module_name = six.ensure_str(module)
class_name = ensure_str(class_name)
module_name = ensure_str(module)
driver_id = ray.DriverID(driver_id_str)
actor_method_names = json.loads(six.ensure_str(actor_method_names))
actor_method_names = json.loads(ensure_str(actor_method_names))
actor_class = None
try: