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

Remove six and Py2SaferScanner merge cruft 

Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-18354
This commit is contained in:
Brandon Williams 2023-03-22 06:24:05 -05:00
parent 3021c33cab
commit a6f8dd10cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
4.1.2
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
4.1.1

3
pylib/cqlshlib/saferscanner.py
View File

@ -19,7 +19,6 @@
# regex in-pattern flags. Any of those can break correct operation of Scanner.
import re
import six
try:
from sre_constants import BRANCH, SUBPATTERN, GROUPREF, GROUPREF_IGNORE, GROUPREF_EXISTS
except ImportError:
@ -101,7 +100,7 @@ class Py311SaferScanner(SaferScannerBase):
self.scanner = re._compiler.compile(p)
SaferScanner = Py36SaferScanner if six.PY3 else Py2SaferScanner
SaferScanner = Py36SaferScanner
if version_info >= (3, 11):
SaferScanner = Py311SaferScanner
elif version_info >= (3, 8):