[incubator-superset] branch master updated: [bugfix] df is None breaks df.empty check (#5657)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d23ae1  [bugfix] df is None breaks df.empty check (#5657)
2d23ae1 is described below

commit 2d23ae1065cd52770ace6cd072aebb74fe195394
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Mon Aug 20 17:01:03 2018 -0700

    [bugfix] df is None breaks df.empty check (#5657)
---
 superset/viz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/viz.py b/superset/viz.py
index 4f2c411..dcd51ed 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -203,7 +203,7 @@ class BaseViz(object):
         # be considered as the default ISO date format
         # If the datetime format is unix, the parse will use the corresponding
         # parsing logic.
-        if not df.empty:
+        if df is not None and not df.empty:
             if DTTM_ALIAS in df.columns:
                 if timestamp_format in ('epoch_s', 'epoch_ms'):
                     # Column has already been formatted as a timestamp.