hprint 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

hprint/__init__.py

@@ -5,10 +5,11 @@ from pprint import pformat
 import os
 import traceback
 import logging
+import textwrap
 
 _print = partial(print, flush=True)
 
-HPRINT_WRAP = os.getenv("HPRINT_WRAP", 50)
+HPRINT_WRAP = int(os.getenv("HPRINT_WRAP", 50))
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +29,10 @@ def json_print(data):
         try:
             _print(json.dumps([dict(d) for d in data], indent=4, sort_keys=True))
         except Exception:
-            _pprint([dict(d) for d in data])
+            try:
+                _pprint([dict(d) for d in data])
+            except Exception:
+                _pprint(data)
     else:
         _pprint(data)
 
@@ -43,10 +47,14 @@ def _chain_get(data, chain, default=None):
     return result.get(attrs[-1], default)
 
 
-def _get(obj, key, default='n/a'):
+def _get(obj, key, default='[none]'):
     if not key:
         return obj
-    return _chain_get(obj, key, default)
+    # return _chain_get(obj, key, default)
+    result = _chain_get(obj, key, default)
+    if result is None:
+        return default
+    return result
 
 
 def tabulate_numbered_print(data, mappings, offset=0):
@@ -78,7 +86,9 @@ def _len(x):
 def _indent(s: str, indent_cols, max_cols):
     lines = s.splitlines()
     if len(lines) <= 1:
-        return s.ljust(max_cols)
+        lines = textwrap.wrap(s, max_cols)
+        if len(lines) <= 1:
+            return s.ljust(max_cols)
     return lines[0] + '\n' + '\n'.join([(' ' * indent_cols + "| " + line) for line in lines[1:]])
 
 
@@ -86,22 +96,29 @@ def x_print(records, headers, offset=0, header=True):
     headers = list(headers)
     left_max_len = max(len(max(headers, key=len)), len(f"-[ RECORD {len(records)} ]-")) + 1
     right_max_len = max(_len(max(record, key=_len)) for record in records) + 1
+    output = []
     for i, record in enumerate(records, 1 + offset):
         if header:
-            _print(f'-[ RECORD {i} ]'.ljust(left_max_len, '-') + '+' + '-' * right_max_len)
+            output.append(f'-[ RECORD {i} ]'.ljust(left_max_len, '-') + '+' + '-' * right_max_len)
+            # _print(f'-[ RECORD {i} ]'.ljust(left_max_len, '-') + '+' + '-' * right_max_len)
         for j, v in enumerate(record):
             # _print(f'{headers[j]}'.ljust(left_max_len) + '| ' + str(v).ljust(right_max_len))
-            _print(f'{headers[j]}'.ljust(left_max_len) + '| ' + _indent(str(v), left_max_len, right_max_len))
+            output.append(f'{headers[j]}'.ljust(left_max_len) + '| ' + _indent(str(v), left_max_len, right_max_len))
+            # _print(f'{headers[j]}'.ljust(left_max_len) + '| ' + _indent(str(v), left_max_len, right_max_len))
+    return os.linesep.join(output)
 
 
 def tabulate_print(data, mappings, x=False, offset=0, header=True, raw=False, tf='simple'):
     if not data:
         return
     if not mappings:
-        keys = set()
+        mappings = {}
+        # keys = set()
         for entry in data:
-            keys = keys.union(entry.keys())
-        mappings = {k: k for k in keys}
+            # keys = keys.union(entry.keys())
+            for k in entry.keys():
+                mappings[k] = k
+        # mappings = {k: k for k in keys}
         # entry_with_most_keys = max(data, key=len)
         # mappings = {k: k for k in entry_with_most_keys.keys()}
     headers = mappings.keys()
@@ -117,15 +134,15 @@ def tabulate_print(data, mappings, x=False, offset=0, header=True, raw=False, tf
                 attrs.append(_get(item, k))
         tabdata.append(attrs)
     if x:
-        x_print(tabdata, headers, offset=offset, header=header)
+        output = x_print(tabdata, headers, offset=offset, header=header)
     else:
         output = tabulate(tabdata, headers=headers if header else (), tablefmt=tf)
-        if raw:
-            return output
-        _print(output)
+    if raw:
+        return output
+    _print(output)
 
 
-def hprint(data, *, mappings=None, json_format=False, as_json=False, x=False, offset=0, numbered=False, missing_value='n/a', tf='simple', header=True, raw=False):
+def hprint(data, *, mappings=None, json_format=False, as_json=False, x=False, offset=0, numbered=False, missing_value='[none]', tf='simple', header=True, raw=False):
     as_json = as_json or json_format
     if not data:
         return
@@ -134,6 +151,8 @@ def hprint(data, *, mappings=None, json_format=False, as_json=False, x=False, of
     _get = partial(_get, default=missing_value)
     try:
         if as_json:
+            if raw:
+                return data
             json_print(data)
         elif not x and numbered:
             tabulate_numbered_print(data, mappings, offset=offset)

{hprint-2.0.4.dist-info → hprint-2.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hprint
-Version: 2.0.4
+Version: 2.0.5
 Summary: Print python object in table/json format
 Home-page: https://github.com/ruanhao/hprint
 Author: Hao Ruan

hprint-2.0.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+hprint/__init__.py,sha256=oicJxWP69JCK_LQquban44ty2yAA4HWALdEJu3ShADQ,5204
+hprint-2.0.5.dist-info/LICENSE,sha256=5IASoCg1AtQddnqyVxltUyoadbZzUpRa_0QvUB-Hwlg,1065
+hprint-2.0.5.dist-info/METADATA,sha256=X828ivFl0Fl6MnAO0aT9jPEYp9k29NC3Hf0CPE8IUkw,5298
+hprint-2.0.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+hprint-2.0.5.dist-info/top_level.txt,sha256=yHUSDt5IDs8J8taLMOu-SaOZK24DyzM0TidniiEJ-Ng,7
+hprint-2.0.5.dist-info/RECORD,,

{hprint-2.0.4.dist-info → hprint-2.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

hprint-2.0.4.dist-info/RECORD

@@ -1,6 +0,0 @@
-hprint/__init__.py,sha256=8_nnG9LHFAuDa-yOt7GyOYe2su8kUBwV8AWS3WjkgWE,4501
-hprint-2.0.4.dist-info/LICENSE,sha256=5IASoCg1AtQddnqyVxltUyoadbZzUpRa_0QvUB-Hwlg,1065
-hprint-2.0.4.dist-info/METADATA,sha256=ajJVE7HDHSpGCwnsnmSfDDXmoOP1oiwETNMwWVekbPw,5298
-hprint-2.0.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-hprint-2.0.4.dist-info/top_level.txt,sha256=yHUSDt5IDs8J8taLMOu-SaOZK24DyzM0TidniiEJ-Ng,7
-hprint-2.0.4.dist-info/RECORD,,