From 07c95e29c5da9eecba883d0705320fa843236923 Mon Sep 17 00:00:00 2001
From: Oleksii Shevchuk <alxchk@gmail.com>
Date: Fri, 19 Oct 2018 17:58:44 +0300
Subject: [PATCH] Fix incomplete push

---
 pupy/modules/ls.py                        | 4 ++--
 pupy/packages/all/pupyutils/basic_cmds.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

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):