You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2015/08/25 03:10:32 UTC
[04/10] cassandra git commit: (cqlsh) default load-from-file encoding
to utf-8 patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
(cqlsh) default load-from-file encoding to utf-8
patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5d0595b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5d0595b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5d0595b
Branch: refs/heads/trunk
Commit: f5d0595b6e0fd3e3bae794c3d5f8016399f6c478
Parents: 447d605
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 24 20:08:51 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 24 20:08:51 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/util.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5d0595b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45e59f7..2d11d55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.9
+ * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
* Avoid returning Permission.None when system_auth.permissions table does not
exist (CASSANDRA-10168)
* (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5d0595b/pylib/cqlshlib/util.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/util.py b/pylib/cqlshlib/util.py
index 4273efc..dfa480d 100644
--- a/pylib/cqlshlib/util.py
+++ b/pylib/cqlshlib/util.py
@@ -118,6 +118,6 @@ def get_file_encoding_bomsize(filename):
file_encoding, size = encoding, len(bom)
break
else:
- file_encoding, size = "ascii", 0
+ file_encoding, size = "utf-8", 0
return (file_encoding, size)