diff --git a/pupy/modules/ls.py b/pupy/modules/ls.py index 7a5ae5f0..36e94895 100644 --- a/pupy/modules/ls.py +++ b/pupy/modules/ls.py @@ -56,8 +56,8 @@ def output_format(file, windows=False, archive=None, time=False, uid_len=0, gid_ out = u' {}{}{}{}{}{}{}'.format( timestamp_field.format(file_timestamp(file[T_TIMESTAMP], time)), u'{:<2}'.format(file[T_TYPE] + ('+' if file[T_HAS_XATTR] else '')), - as_unicode(file[T_UID]).rjust(uid_len+1)+' ', - as_unicode(file[T_GID]).rjust(gid_len+1)+' ', + to_utf8(file[T_UID]).rjust(uid_len+1)+' ', + to_utf8(file[T_GID]).rjust(gid_len+1)+' ', u'{:04o} '.format(file[T_MODE] & 0o7777), u'{:>9}'.format(size_human_readable(file[T_SIZE])), u' {:<40}'.format(name)) diff --git a/pupy/packages/all/pupyutils/basic_cmds.py b/pupy/packages/all/pupyutils/basic_cmds.py index e756a1d4..e6eb0434 100644 --- a/pupy/packages/all/pupyutils/basic_cmds.py +++ b/pupy/packages/all/pupyutils/basic_cmds.py @@ -39,8 +39,7 @@ T_HAS_XATTR = 14 textchars = bytearray({7,8,9,10,12,13,27} | set(range(0x20, 0x100)) - {0x7f}) from fsutils import ( - readlink, lstat, has_xattrs, - uidgid, getacls, getcaps + readlink, lstat, has_xattrs, uidgid ) def is_binary(text):