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

Accommodate python 3.11 

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18088
This commit is contained in:
Brandon Williams 2022-12-04 13:05:19 -06:00
parent 9471ee762c
commit cd38edbb41
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -3,6 +3,7 @@
* Streaming progress virtual table lock contention can trigger TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
* Fix perpetual load of denylist on read in cases where denylist can never be loaded (CASSANDRA-18116)
Merged from 4.0:
* Add support for python 3.11 (CASSANDRA-18088)
* Fix formatting of duration in cqlsh (CASSANDRA-18141)
* Fix sstable loading of keyspaces named snapshots or backups (CASSANDRA-14013)
* Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables (CASSANDRA-17977)

28
pylib/cqlshlib/saferscanner.py
View File

@ -19,7 +19,11 @@
# regex in-pattern flags. Any of those can break correct operation of Scanner.
import re
from sre_constants import BRANCH, SUBPATTERN, GROUPREF, GROUPREF_IGNORE, GROUPREF_EXISTS
import six
try:
from sre_constants import BRANCH, SUBPATTERN, GROUPREF, GROUPREF_IGNORE, GROUPREF_EXISTS
except ImportError:
from re._constants import BRANCH, SUBPATTERN, GROUPREF, GROUPREF_IGNORE, GROUPREF_EXISTS
from sys import version_info
@ -81,4 +85,24 @@ class Py38SaferScanner(SaferScannerBase):
self.scanner = re.sre_compile.compile(p)
SaferScanner = Py38SaferScanner if version_info >= (3, 8) else Py36SaferScanner
class Py311SaferScanner(SaferScannerBase):
def __init__(self, lexicon, flags=0):
self.lexicon = lexicon
p = []
s = re._parser.State()
s.flags = flags
for phrase, action in lexicon:
gid = s.opengroup()
p.append(re._parser.SubPattern(s, [(SUBPATTERN, (gid, 0, 0, re._parser.parse(phrase, flags))), ]))
s.closegroup(gid, p[-1])
p = re._parser.SubPattern(s, [(BRANCH, (None, p))])
self.p = p
self.scanner = re._compiler.compile(p)
SaferScanner = Py36SaferScanner if six.PY3 else Py2SaferScanner
if version_info >= (3, 11):
SaferScanner = Py311SaferScanner
elif version_info >= (3, 8):
SaferScanner = Py38SaferScanner