Fixes for CodeQL (#54)

plotille/_cmaps.py

@@ -38,7 +38,7 @@ class Colormap(object):
     Colormap represents. Scaling the data into the `[0, 1]` interval is
     responsibility of the caller.
     """
-    def __init__(self, name):
+    def __init__(self, name, lookup_table=None):
         """
         Parameters
         ----------
@@ -48,7 +48,7 @@ def __init__(self, name):
             The number of rgb quantization levels.
         """
         self.name = name
-        self._lookup_table = None
+        self._lookup_table = lookup_table
         self.bad = None
         self.over = None
         self.under = None
@@ -86,8 +86,7 @@ def _process_value(self, x):
 
 class ListedColormap(Colormap):
     def __init__(self, name, colors):
-        super(ListedColormap, self).__init__(name)
-        self._lookup_table = colors
+        super(ListedColormap, self).__init__(name, lookup_table=colors)
 
     @classmethod
     def from_relative(cls, name, colors):

plotille/_figure.py

@@ -31,7 +31,7 @@
 from ._colors import color, rgb2byte
 from ._figure_data import Heat, Histogram, Plot, Span, Text
 from ._input_formatter import InputFormatter
-from ._util import mk_timedelta, timestamp
+from ._util import mk_timedelta
 
 # TODO documentation!!!
 # TODO tests
@@ -244,7 +244,7 @@ def _limits(self, low_set, high_set, is_height):
     def _y_axis(self, ymin, ymax, label='Y'):
         delta = abs(ymax - ymin)
         if isinstance(delta, timedelta):
-            y_delta = mk_timedelta(timestamp(delta) / self.height)
+            y_delta = mk_timedelta(delta.total_seconds() / self.height)
         else:
             y_delta = delta / self.height
 
@@ -271,7 +271,7 @@ def _y_axis(self, ymin, ymax, label='Y'):
     def _x_axis(self, xmin, xmax, label='X', with_y_axis=False):
         delta = abs(xmax - xmin)
         if isinstance(delta, timedelta):
-            x_delta = mk_timedelta(timestamp(delta) / self.width)
+            x_delta = mk_timedelta(delta.total_seconds() / self.width)
         else:
             x_delta = delta / self.width
         starts = ['', '']
@@ -546,7 +546,7 @@ def _diff(low, high):
     else:
         delta = abs(high - low)
         if isinstance(delta, timedelta):
-            return mk_timedelta(timestamp(delta) * 0.1)
+            return mk_timedelta(delta.total_seconds() * 0.1)
         else:
             return delta * 0.1
 
@@ -568,6 +568,7 @@ def _default(low_set, high_set):
             return low_set, 1.0
 
     # Should never get here! => checked in function before
+    raise ValueError('Unexpected inputs!')
 
 
 def _choose(low, high, low_set, high_set):
@@ -600,3 +601,4 @@ def _choose(low, high, low_set, high_set):
             return low_set, high + diff
 
         # Should never get here! => checked in function before
+        raise ValueError('Unexpected inputs!')

plotille/_input_formatter.py

@@ -27,7 +27,7 @@
 from datetime import date, datetime, time, timedelta
 import math
 
-from ._util import roundeven, timestamp
+from ._util import roundeven
 
 
 class InputFormatter(object):
@@ -138,6 +138,7 @@ def _num_formatter(val, chars, delta, left=False):
         return _int_formatter(val, chars, left)
     elif isinstance(val, float):
         return _float_formatter(val, chars, left)
+    # unreachable
 
 
 def _float_formatter(val, chars, left=False):
@@ -206,7 +207,7 @@ def _convert_numbers(v):
 
 def _convert_np_datetime(v):
     # assert isinstance(v, np.datetime64)
-    return timestamp(v.item())
+    return v.item().timestamp()
 
 
 def _convert_date(v):
@@ -216,4 +217,4 @@ def _convert_date(v):
 
 def _convert_datetime(v):
     assert isinstance(v, datetime)
-    return timestamp(v)
+    return v.timestamp()

plotille/_util.py

@@ -23,9 +23,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from datetime import datetime, timedelta, tzinfo
+from datetime import timedelta, tzinfo
 import math
-import time
 
 
 def roundeven(x):
@@ -78,7 +77,7 @@ def hist(X, bins):
     is_datetime = False
     if isinstance(delta, timedelta):
         is_datetime = True
-        delta = timestamp(delta)
+        delta = delta.total_seconds()
 
     xwidth = delta / bins
 
@@ -87,7 +86,7 @@ def hist(X, bins):
         x_ = _numpy_to_native(x)
         delta = (x_ - xmin)
         if isinstance(delta, timedelta):
-            delta = timestamp(delta)
+            delta = delta.total_seconds()
         x_idx = min(bins - 1, int(delta // xwidth))
         y[x_idx] += 1
 
@@ -111,20 +110,6 @@ def dst(self, dt):
         return self._ZERO
 
 
-_EPOCH = datetime(1970, 1, 1, tzinfo=_UTC())
-
-
-def timestamp(v):
-    """Get timestamp of `v` datetime in py2/3."""
-    if isinstance(v, datetime):
-        if v.tzinfo is None:
-            return time.mktime(v.timetuple()) + v.microsecond / 1e6
-        else:
-            return (v - _EPOCH).total_seconds()
-    elif isinstance(v, timedelta):
-        return v.total_seconds()
-
-
 def mk_timedelta(v):
     seconds = int(v)
     microseconds = int((v - seconds) * 1e6)

tests/test_data.py

@@ -66,7 +66,7 @@ def test_circle(radius):
     assert Y[0] == pytest.approx(Y[-1], abs=0.001)
 
     for x, y in zip(X, Y):
-        assert math.sqrt(x**2 + y**2) == pytest.approx(radius**10, abs=0.001)
+        assert math.hypot(x, y) == pytest.approx(radius**10, abs=0.001)
         equal = 0
         for x2, y2 in zip(X, Y):
             if x2 == x and y2 == y:

tests/test_examples.py

@@ -7,19 +7,6 @@
 
 import pytest
 
-try:
-    import numpy  # noqa: F401
-    have_numpy = True
-except ImportError:
-    have_numpy = False
-
-
-try:
-    from PIL import Image  # noqa: F401
-    have_pillow = True
-except ImportError:
-    have_pillow = False
-
 
 @pytest.fixture
 def change_to_examples_dir(request):
@@ -28,8 +15,6 @@ def change_to_examples_dir(request):
     os.chdir(str(request.config.invocation_dir))
 
 
-@pytest.mark.skipif(not have_numpy, reason='No numpy installed.')
-@pytest.mark.skipif(not have_pillow, reason='No pillow installed.')
 def test_examples(change_to_examples_dir):
     sys.path.insert(0, '.')
     for fname in glob('*_example.py'):