提交 3b8f7154 编写于 作者: J jingqinghe

make hdfs utils compatible to python3

上级 9aecb4bd
...@@ -18,6 +18,7 @@ import sys ...@@ -18,6 +18,7 @@ import sys
import subprocess import subprocess
import multiprocessing import multiprocessing
from datetime import datetime from datetime import datetime
from functools import cmp_to_key
import re import re
import copy import copy
...@@ -419,7 +420,7 @@ class HDFSClient(object): ...@@ -419,7 +420,7 @@ class HDFSClient(object):
hdfs_path)) hdfs_path))
lines = [] lines = []
regex = re.compile('\s+') regex = re.compile('\s+')
out_lines = output.strip().split("\n") out_lines = output.strip().decode().split("\n")
for line in out_lines: for line in out_lines:
re_line = regex.split(line) re_line = regex.split(line)
if len(re_line) == 8: if len(re_line) == 8:
...@@ -429,7 +430,7 @@ class HDFSClient(object): ...@@ -429,7 +430,7 @@ class HDFSClient(object):
lines.append( lines.append(
(re_line[7], re_line[5] + " " + re_line[6])) (re_line[7], re_line[5] + " " + re_line[6]))
if sort: if sort:
sorted(lines, cmp=sort_by_time) sorted(lines, key=cmp_to_key(sort_by_time))
ret_lines = [ret[0] for ret in lines] ret_lines = [ret[0] for ret in lines]
return ret_lines return ret_lines
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册