natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Bereng 2022-06-14 06:58:30 +02:00
parent 2531dd1eba f884dda75b
commit bb5b2d2889
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylib/cqlshlib/formatting.py
View File

@ -37,8 +37,8 @@ from .util import UTC
is_win = platform.system() == 'Windows'
unicode_controlchars_re = re.compile(r'[\x00-\x31\x7f-\xa0]')
controlchars_re = re.compile(r'[\x00-\x31\x7f-\xff]')
unicode_controlchars_re = re.compile(r'[\x00-\x1f\x7f-\xa0]')
controlchars_re = re.compile(r'[\x00-\x1f\x7f-\xff]')
def _show_control_chars(match):

4
pylib/cqlshlib/test/test_unicode.py
View File

@ -22,6 +22,7 @@ import subprocess
from .basecase import BaseTestCase
from .cassconnect import (get_cassandra_connection, create_keyspace, testrun_cqlsh)
from cqlshlib.formatting import unicode_controlchars_re
class TestCqlshUnicode(BaseTestCase):
@ -73,3 +74,6 @@ class TestCqlshUnicode(BaseTestCase):
self.assertIn(v1, output)
output = c.cmd_and_response('DESC TYPE "%s";' %(v1,))
self.assertIn(v2, output)
def test_unicode_esc(self): # CASSANDRA-17617
self.assertFalse(unicode_controlchars_re.match("01"))