From commits-return-2333-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Sun Mar 3 23:27:24 2019 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 84E56180630 for ; Mon, 4 Mar 2019 00:27:24 +0100 (CET) Received: (qmail 70359 invoked by uid 500); 3 Mar 2019 23:27:23 -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 70350 invoked by uid 99); 3 Mar 2019 23:27:23 -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; Sun, 03 Mar 2019 23:27:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 207AC87762; Sun, 3 Mar 2019 23:27:23 +0000 (UTC) Date: Sun, 03 Mar 2019 23:27:22 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] branch master updated: [csv-upload] Fixing message encoding (#6971) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155165564270.21932.4933545185297861831@gitbox.apache.org> From: johnbodley@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: 0a8bc84a02c114e620aa3273077333ba12947e26 X-Git-Newrev: 48431ab5b9375a94c5262a0336d9c69e5f01a3ac X-Git-Rev: 48431ab5b9375a94c5262a0336d9c69e5f01a3ac 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. johnbodley 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 48431ab [csv-upload] Fixing message encoding (#6971) 48431ab is described below commit 48431ab5b9375a94c5262a0336d9c69e5f01a3ac Author: John Bodley <4567245+john-bodley@users.noreply.github.com> AuthorDate: Sun Mar 3 15:27:08 2019 -0800 [csv-upload] Fixing message encoding (#6971) --- superset/views/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/views/core.py b/superset/views/core.py index 48f8324..b566c77 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -401,7 +401,7 @@ class CsvToDatabaseView(SimpleFormView): except OSError: pass message = 'Table name {} already exists. Please pick another'.format( - form.name.data) if isinstance(e, IntegrityError) else e + form.name.data) if isinstance(e, IntegrityError) else str(e) flash( message, 'danger')