Merge pull request #1633 from kernc/fixup

Fixups

Author: astaric

Orange/canvas/application/errorreporting.py

@@ -157,14 +157,17 @@ def handle_exception(cls, exc):
         stacktrace = ''.join(traceback.format_exception(etype, evalue, tb))
 
         def _find_last_frame(tb):
+            if not tb:
+                return None
             while tb.tb_next:
                 tb = tb.tb_next
             return tb
 
-        frame = _find_last_frame(tb)
-        err_module = '{}:{}'.format(
-            frame.tb_frame.f_globals.get('__name__', frame.tb_frame.f_code.co_filename),
-            frame.tb_lineno)
+        err_module, frame = None, _find_last_frame(tb)
+        if frame:
+            err_module = '{}:{}'.format(
+                frame.tb_frame.f_globals.get('__name__', frame.tb_frame.f_code.co_filename),
+                frame.tb_lineno)
 
         def _find_widget_frame(tb):
             while tb:

Orange/data/variable.py

@@ -919,13 +919,21 @@ def _tzre_sub(s, _subtz=re.compile(r'([+-])(\d\d):(\d\d)$').sub):
     def repr_val(self, val):
         if isnan(val):
             return '?'
+        if not self.have_date and not self.have_time:
+            # The time is relative, unitless. The value is absolute.
+            return str(val)
+
+        # If you know how to simplify this, be my guest
         seconds = int(val)
         microseconds = int(round((val - seconds) * 1e6))
         if val < 0:
+            if microseconds:
+                seconds, microseconds = seconds - 1, int(1e6) + microseconds
             date = datetime.fromtimestamp(0, tz=self.timezone) + timedelta(seconds=seconds)
         else:
             date = datetime.fromtimestamp(seconds, tz=self.timezone)
         date = str(date.replace(microsecond=microseconds))
+
         if self.have_date and not self.have_time:
             date = date.split()[0]
         elif not self.have_date and self.have_time:
@@ -956,7 +964,9 @@ def parse(self, datestr):
         if not self._matches_iso_format(datestr):
             try:
                 # If it is a number, assume it is a unix timestamp
-                return float(datestr)
+                value = float(datestr)
+                self.have_date = self.have_time = 1
+                return value
             except ValueError:
                 raise ERROR
 

Orange/tests/test_util.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from Orange.util import export_globals, flatten, deprecated, try_
+from Orange.util import export_globals, flatten, deprecated, try_, deepgetattr
 
 
 SOMETHING = 0xf00babe
@@ -30,3 +30,10 @@ def test_try_(self):
         self.assertTrue(try_(lambda: np.ones(3).any()))
         self.assertFalse(try_(lambda: np.whatever()))
         self.assertEqual(try_(len, default=SOMETHING), SOMETHING)
+
+    def test_deepgetattr(self):
+        class a:
+            l = []
+        self.assertTrue(deepgetattr(a, 'l.__len__.__call__'), a.l.__len__.__call__)
+        self.assertTrue(deepgetattr(a, 'l.__nx__.__x__', 42), 42)
+        self.assertRaises(AttributeError, lambda: deepgetattr(a, 'l.__nx__.__x__'))

Orange/tests/test_variable.py

@@ -313,10 +313,10 @@ class TestTimeVariable(VariableTest):
         ('01:01', 3660, '01:01:00'),
         ('1970-01-01 00:00:00', 0, '1970-01-01 00:00:00'),
         ('1969-12-31 23:59:59', -1, '1969-12-31 23:59:59'),
+        ('1969-12-31 23:59:58.9', -1.1, '1969-12-31 23:59:58.900000'),
         ('1900-01-01', -2208988800, '1900-01-01'),
         ('nan', np.nan, '?'),
         ('1444651991.81', 1444651991.81, '2015-10-12 12:13:11.810000'),
-        (1444651991.81, 1444651991.81, '2015-10-12 12:13:11.810000'),
     ]
 
     def test_parse_repr(self):
@@ -356,6 +356,9 @@ def test_have_date(self):
         # observe have datetime
         self.assertEqual(var.repr_val(ts), '1970-01-01 16:20:00')
 
+    def test_no_date_no_time(self):
+        self.assertEqual(TimeVariable('relative time').repr_val(1.6), '1.6')
+
     def test_readwrite_timevariable(self):
         output_csv = StringIO()
         input_csv = StringIO("""\

Orange/util.py

@@ -2,6 +2,7 @@
 
 from functools import wraps
 from inspect import isfunction
+from operator import attrgetter
 from itertools import chain, count
 from collections import OrderedDict
 import warnings
@@ -129,6 +130,21 @@ def export_globals(globals, module_name):
                 not getattr(v, '__name__', k).startswith('_'))]  # neither marked internal
 
 
+_NOTSET = object()
+
+
+def deepgetattr(obj, attr, default=_NOTSET):
+    """Works exactly like getattr(), except that attr can be a nested attribute
+    (e.g. "attr1.attr2.attr3").
+    """
+    try:
+        return attrgetter(attr)(obj)
+    except AttributeError:
+        if default is _NOTSET:
+            raise
+        return default
+
+
 def color_to_hex(color):
     return "#{:02X}{:02X}{:02X}".format(*color)
 

Orange/widgets/utils/__init__.py

@@ -1,5 +1,5 @@
-from functools import reduce
 from Orange.data.variable import TimeVariable
+from Orange.util import deepgetattr
 
 
 def vartype(var):
@@ -22,14 +22,7 @@ def progress_bar_milestones(count, iterations=100):
 def getdeepattr(obj, attr, *arg, **kwarg):
     if isinstance(obj, dict):
         return obj.get(attr)
-    try:
-        return reduce(getattr, attr.split("."), obj)
-    except AttributeError:
-        if arg:
-            return arg[0]
-        if kwarg:
-            return kwarg["default"]
-        raise
+    return deepgetattr(obj, attr, *arg, **kwarg)
 
 
 def to_html(str):