From f5d0595b6e0fd3e3bae794c3d5f8016399f6c478 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 24 Aug 2015 20:08:51 -0500 Subject: [PATCH] (cqlsh) default load-from-file encoding to utf-8 patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898 --- CHANGES.txt | 1 + pylib/cqlshlib/util.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 45e59f7a4a..2d11d558b3 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) diff --git a/pylib/cqlshlib/util.py b/pylib/cqlshlib/util.py index 4273efcf70..dfa480dcbf 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)