This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a2af87de8a05af387442344cac87c50a46ba6dd8
Merge: 2aef55b2a0 bf9d334f54
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Aug 18 13:57:28 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
bin/cqlsh.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc bin/cqlsh.py
index ca381a904f,f717807e41..ddaaf78fd4
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -546,11 -541,20 +546,11 @@@ class Shell(cmd.Cmd)
if extra:
baseversion = baseversion[0:extra]
if baseversion != build_version:
- print("WARNING: cqlsh was built against {}, but this server is
{}. All features may not work!".format(baseversion, build_version))
+ print("WARNING: cqlsh was built against {}, but this server is
{}. All features may not work!".format(build_version, baseversion))
@property
- def is_using_utf8(self):
- # utf8 encodings from
https://docs.python.org/{2,3}/library/codecs.html
- return self.encoding.replace('-', '_').lower() in ['utf', 'utf_8',
'u8', 'utf8', CP65001]
-
- def check_windows_encoding(self):
- if is_win and os.name == 'nt' and self.tty and \
- self.is_using_utf8 and sys.stdout.encoding != CP65001:
- self.printerr("\nWARNING: console codepage must be set to cp65001
"
- "to support {} encoding on Windows platforms.\n"
- "If you experience encoding problems, change your
console"
- " codepage with 'chcp 65001' before starting
cqlsh.\n".format(self.encoding))
+ def batch_mode(self):
+ return not self.tty
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
