From commits-return-1336-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Tue Aug 21 02:01:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 84E7B180663 for ; Tue, 21 Aug 2018 02:01:07 +0200 (CEST) Received: (qmail 57850 invoked by uid 500); 21 Aug 2018 00:01:06 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 57841 invoked by uid 99); 21 Aug 2018 00:01:06 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2018 00:01:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 1887B853BA; Tue, 21 Aug 2018 00:01:06 +0000 (UTC) Date: Tue, 21 Aug 2018 00:01:05 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] branch master updated: [bugfix] df is None breaks df.empty check (#5657) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153480966588.657.16830228561823829074@gitbox.apache.org> From: maximebeauchemin@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 683edc377ec80a88c65bdede3e22bd1c7cf917ec X-Git-Newrev: 2d23ae1065cd52770ace6cd072aebb74fe195394 X-Git-Rev: 2d23ae1065cd52770ace6cd072aebb74fe195394 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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.