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-3.1 Commit: cd75ecd90fe7c49c09dde8e4545555edd235b1a2 Parents: a90c3b2 9768e57 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Nov 25 17:52:58 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> 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
