Adjust width better.

alexhsamuel · Jan 30, 2018 · c86d6cb · c86d6cb
1 parent 891b8ad
commit c86d6cb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/python/fixfmt/PyTickTime.cc b/python/fixfmt/PyTickTime.cc
@@ -101,7 +101,7 @@ Type PyTickTime::type_ = PyTypeObject{
   (PySequenceMethods*)  nullptr,                            // tp_as_sequence
   (PyMappingMethods*)   nullptr,                            // tp_as_mapping
   (hashfunc)            nullptr,                            // tp_hash
-  (ternaryfunc)         tp_call,                            // tp_call
+  (ternaryfunc)         wrap<PyTickTime, tp_call>,          // tp_call
   (reprfunc)            nullptr,                            // tp_str
   (getattrofunc)        nullptr,                            // tp_getattro
   (setattrofunc)        nullptr,                            // tp_setattro

diff --git a/python/fixfmt/npfmt.py b/python/fixfmt/npfmt.py
@@ -16,6 +16,7 @@
 #-------------------------------------------------------------------------------
 
 DEFAULT_CFG = {
+    "min_width"         : 0,
     "bool": {
         "min_width"     : 0,
         "true"          : "true",
@@ -175,11 +176,12 @@ def choose_formatter_datetime64(values, min_width=0, cfg=DEFAULT_CFG["time"]):
     else:
         precision = min_prec
 
+    precision = -1 if precision < 1 else precision
     return TickTime(10 ** scale, precision)
 
 
 def choose_formatter_str(arr, min_width=0, cfg=DEFAULT_CFG["string"]):
-    min_width   = max(min_width, cfg["min_width"])
+    min_width = max(min_width, cfg["min_width"])
 
     size = cfg["size"]
     if size is None:
@@ -199,6 +201,8 @@ def choose_formatter_str(arr, min_width=0, cfg=DEFAULT_CFG["string"]):
 
 
 def choose_formatter(arr, min_width=0, cfg=DEFAULT_CFG):
+    min_width = max(min_width, cfg["min_width"])
+
     dtype = arr.dtype
     if dtype.kind == "b":
         return choose_formatter_bool(arr, min_width, cfg=cfg["bool"])

diff --git a/python/fixfmt/test/test_choose_formatter.py b/python/fixfmt/test/test_choose_formatter.py
@@ -46,7 +46,7 @@ def test_non_contiguous():
 
     fmt = choose_formatter(arr.time)
     assert isinstance(fmt, fixfmt.TickTime)
-    assert fmt.precision == 0
+    assert fmt.precision == -1
 
     fmt = choose_formatter(arr.fast)
     assert isinstance(fmt, fixfmt.TickTime)