From a6f8dd10cd8b283339c08b50ed6357b213b89dc4 Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Wed, 22 Mar 2023 06:24:05 -0500
Subject: [PATCH] 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):