Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A8952186C6 for ; Wed, 25 Nov 2015 23:53:08 +0000 (UTC) Received: (qmail 23147 invoked by uid 500); 25 Nov 2015 23:53:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 23079 invoked by uid 500); 25 Nov 2015 23:53:08 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 22969 invoked by uid 99); 25 Nov 2015 23:53:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Nov 2015 23:53:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4478CE193C; Wed, 25 Nov 2015 23:53:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Wed, 25 Nov 2015 23:53:09 -0000 Message-Id: <7837c9b9aed34ed0b5d46f500be39726@git.apache.org> In-Reply-To: <037237c0022f4db3a059bf4895e3b7ae@git.apache.org> References: <037237c0022f4db3a059bf4895e3b7ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd75ecd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd75ecd9 Branch: refs/heads/cassandra-2.2 Commit: cd75ecd90fe7c49c09dde8e4545555edd235b1a2 Parents: a90c3b2 9768e57 Author: Tyler Hobbs Authored: Wed Nov 25 17:52:58 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:52:58 2015 -0600 ---------------------------------------------------------------------- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd75ecd9/pylib/cqlshlib/formatting.py ---------------------------------------------------------------------- diff --cc pylib/cqlshlib/formatting.py index 8b66bce,b740bf9..62ecd10 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@@ -15,15 -15,13 +15,15 @@@ # limitations under the License. import binascii -import sys -import re import calendar import math +import re +import sys +import platform - from collections import defaultdict + import wcwidth + - from . import wcwidth - from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP + from collections import defaultdict + from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC