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
The following commit(s) were added to refs/heads/cassandra-4.1 by this push:
new a6f8dd10cd Remove six and Py2SaferScanner merge cruft
a6f8dd10cd is described below
commit a6f8dd10cd8b283339c08b50ed6357b213b89dc4
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Mar 22 06:24:05 2023 -0500
Remove six and Py2SaferScanner merge cruft
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-18354
---
CHANGES.txt | 1 +
pylib/cqlshlib/saferscanner.py | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index aa3f9a9a4f..27e7d998f2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.1.2
+ * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
4.1.1
diff --git a/pylib/cqlshlib/saferscanner.py b/pylib/cqlshlib/saferscanner.py
index 5afd8ef172..2c2b6100d9 100644
--- a/pylib/cqlshlib/saferscanner.py
+++ b/pylib/cqlshlib/saferscanner.py
@@ -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):
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
