Merge pull request #215 from JVickery-TBS/fix/log-local-py3

LocalCKAN Logging for PY3
ckan · Mar 13, 2024 · ddbb0ba · ddbb0ba
2 parents 080e8c7 + c67636e
commit ddbb0ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ckanapi/cli/main.py b/ckanapi/cli/main.py
@@ -151,12 +151,12 @@ def main(running_with_paster=False):
                 # cannot find user
                 out = '<unknown user>'
             else:
-                # remove line breaks from whoami's
-                out = out.replace('\n', '').replace('\r', '')
+                # decode and remove line breaks from whoami's
+                out = out.decode().replace('\n', '').replace('\r', '')
                 # split the `who am i`
                 out = out.split()[0]
             log.info('OS User %s executed LocalCKAN: ckanapi %s',
-                     out, u' '.join(sys.argv[1:]))
+                     out, ' '.join(sys.argv[1:]))
 
     stdout = getattr(sys.stdout, 'buffer', sys.stdout)
     if arguments['action']: