remove: dead unichr() code blocks guarded by Python 2 version check

- test_validation.py: remove 'if sys.version_info < (3, 1)' blocks that
  tested unichr() (only available in Python 2).  Also fix 'class
  DataType():' to 'class DataType:'.
- test_metadata.py: delete test_export_keyspace_schema_udts which was
  skipped on all Python versions except 2.7.

Author: mykaul

tests/integration/cqlengine/columns/test_validation.py

@@ -190,7 +190,7 @@ def test_varint_io(self):
             self.VarIntTest.objects.create(test_id=0, bignum="not_a_number")
 
 
-class DataType():
+class DataType:
     @classmethod
     def setUpClass(cls):
         if PROTOCOL_VERSION < 4 or CASSANDRA_VERSION < Version("3.0"):
@@ -611,9 +611,6 @@ def test_type_checking(self):
         with pytest.raises(ValidationError):
             Ascii().validate('Beyonc' + chr(233))
 
-        if sys.version_info < (3, 1):
-            with pytest.raises(ValidationError):
-                Ascii().validate('Beyonc' + unichr(233))
 
     def test_unaltering_validation(self):
         """ Test the validation step doesn't re-interpret values. """
@@ -735,8 +732,6 @@ def test_type_checking(self):
 
         Text().validate("!#$%&\'()*+,-./")
         Text().validate('Beyonc' + chr(233))
-        if sys.version_info < (3, 1):
-            Text().validate('Beyonc' + unichr(233))
 
     def test_unaltering_validation(self):
         """ Test the validation step doesn't re-interpret values. """

tests/integration/standard/test_metadata.py

@@ -1119,82 +1119,6 @@ def test_export_keyspace_schema(self):
             assert isinstance(keyspace_metadata.as_cql_query(), str)
         cluster.shutdown()
 
-    @greaterthancass20
-    def test_export_keyspace_schema_udts(self):
-        """
-        Test udt exports
-        """
-
-        if PROTOCOL_VERSION < 3:
-            raise unittest.SkipTest(
-                "Protocol 3.0+ is required for UDT change events, currently testing against %r"
-                % (PROTOCOL_VERSION,))
-
-        if sys.version_info[0:2] != (2, 7):
-            raise unittest.SkipTest('This test compares static strings generated from dict items, which may change orders. Test with 2.7.')
-
-        cluster = TestCluster()
-        session = cluster.connect()
-
-        session.execute("""
-            CREATE KEYSPACE export_udts
-            WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}
-            AND durable_writes = true;
-        """)
-        session.execute("""
-            CREATE TYPE export_udts.street (
-                street_number int,
-                street_name text)
-        """)
-        session.execute("""
-            CREATE TYPE export_udts.zip (
-                zipcode int,
-                zip_plus_4 int)
-        """)
-        session.execute("""
-            CREATE TYPE export_udts.address (
-                street_address frozen<street>,
-                zip_code frozen<zip>)
-        """)
-        session.execute("""
-            CREATE TABLE export_udts.users (
-            user text PRIMARY KEY,
-            addresses map<text, frozen<address>>)
-        """)
-
-        expected_prefix = """CREATE KEYSPACE export_udts WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}  AND durable_writes = true;
-
-CREATE TYPE export_udts.street (
-    street_number int,
-    street_name text
-);
-
-CREATE TYPE export_udts.zip (
-    zipcode int,
-    zip_plus_4 int
-);
-
-CREATE TYPE export_udts.address (
-    street_address frozen<street>,
-    zip_code frozen<zip>
-);
-
-CREATE TABLE export_udts.users (
-    user text PRIMARY KEY,
-    addresses map<text, frozen<address>>"""
-
-        assert_startswith_diff(cluster.metadata.keyspaces['export_udts'].export_as_string(), expected_prefix)
-
-        table_meta = cluster.metadata.keyspaces['export_udts'].tables['users']
-
-        expected_prefix = """CREATE TABLE export_udts.users (
-    user text PRIMARY KEY,
-    addresses map<text, frozen<address>>"""
-
-        assert_startswith_diff(table_meta.export_as_string(), expected_prefix)
-
-        cluster.shutdown()
-
     @greaterthancass21
     @xfail_scylla_version_lt(reason='scylladb/scylladb#10707 - Column name in CREATE INDEX is not quoted',
                              oss_scylla_version="5.2", ent_scylla_version="2023.1.1")