Remove u'' string prefixes from test code

On Python 3, the u'' prefix is a no-op since all strings are already
unicode. These prefixes were left over from Python 2 compatibility.

Removed 67 u-prefix occurrences across 9 test files:
- tests/unit/test_types.py (3)
- tests/unit/test_orderedmap.py (3)
- tests/unit/test_marshalling.py (6)
- tests/unit/test_metadata.py (27)
- tests/integration/standard/test_types.py (4)
- tests/integration/standard/test_query.py (13)
- tests/integration/standard/test_cluster.py (8)
- tests/integration/cqlengine/model/test_udts.py (1)
- tests/integration/cqlengine/model/test_model_io.py (2)

All 608 unit tests pass.

Author: mykaul

tests/integration/cqlengine/model/test_model_io.py

@@ -694,9 +694,9 @@ def setUp(self):
     def test_query_with_date(self):
         uid = uuid4()
         day = date(2013, 11, 26)
-        obj = TestQueryModel.create(test_id=uid, date=day, description=u'foo')
+        obj = TestQueryModel.create(test_id=uid, date=day, description='foo')
 
-        assert obj.description == u'foo'
+        assert obj.description == 'foo'
 
         inst = TestQueryModel.filter(
             TestQueryModel.test_id == uid,

tests/integration/cqlengine/model/test_udts.py

@@ -383,7 +383,7 @@ def test_udts_with_unicode(self):
         @test_category data_types:udt
         """
         ascii_name = 'normal name'
-        unicode_name = u'Fran\u00E7ois'
+        unicode_name = 'Fran\u00E7ois'
 
         class UserModelText(Model):
             id = columns.Text(primary_key=True)

tests/integration/standard/test_cluster.py

@@ -1267,14 +1267,14 @@ def test_compact_option(self):
                 "({i}, 'a{i}{i}', {i}{i}, {i}{i}, textAsBlob('b{i}{i}'))".format(i=i))
 
         nc_results = nc_session.execute("SELECT * FROM compact_table")
-        assert set(nc_results.current_rows) == {(1, u'a1', 11, 11, 'b1'),
-         (1, u'a11', 11, 11, 'b11'),
-         (2, u'a2', 22, 22, 'b2'),
-         (2, u'a22', 22, 22, 'b22'),
-         (3, u'a3', 33, 33, 'b3'),
-         (3, u'a33', 33, 33, 'b33'),
-         (4, u'a4', 44, 44, 'b4'),
-         (4, u'a44', 44, 44, 'b44')}
+        assert set(nc_results.current_rows) == {(1, 'a1', 11, 11, 'b1'),
+         (1, 'a11', 11, 11, 'b11'),
+         (2, 'a2', 22, 22, 'b2'),
+         (2, 'a22', 22, 22, 'b22'),
+         (3, 'a3', 33, 33, 'b3'),
+         (3, 'a33', 33, 33, 'b33'),
+         (4, 'a4', 44, 44, 'b4'),
+         (4, 'a44', 44, 44, 'b44')}
 
         results = session.execute("SELECT * FROM compact_table")
         assert set(results.current_rows) == {(1, 11, 11),

tests/integration/standard/test_query.py

@@ -323,7 +323,7 @@ def test_column_names(self):
         result_set = self.session.execute("SELECT * FROM {0}.{1}".format(self.keyspace_name, self.function_table_name))
         assert result_set.column_types is not None
 
-        assert result_set.column_names == [u'user', u'game', u'year', u'month', u'day', u'score']
+        assert result_set.column_names == ['user', 'game', 'year', 'month', 'day', 'score']
 
     @greaterthanorequalcass30
     def test_basic_json_query(self):
@@ -759,11 +759,11 @@ def test_unicode(self):
                 k int PRIMARY KEY,
                 v text )'''
         self.session.execute(ddl)
-        unicode_text = u'Fran\u00E7ois'
-        query = u'INSERT INTO test3rf.testtext (k, v) VALUES (%s, %s)'
+        unicode_text = 'Fran\u00E7ois'
+        query = 'INSERT INTO test3rf.testtext (k, v) VALUES (%s, %s)'
         try:
             batch = BatchStatement(BatchType.LOGGED)
-            batch.add(u"INSERT INTO test3rf.testtext (k, v) VALUES (%s, %s)", (0, unicode_text))
+            batch.add("INSERT INTO test3rf.testtext (k, v) VALUES (%s, %s)", (0, unicode_text))
             self.session.execute(batch)
         finally:
             self.session.execute("DROP TABLE test3rf.testtext")
@@ -1338,12 +1338,12 @@ def test_unicode(self):
         @test_category query
         """
 
-        unicode_text = u'Fran\u00E7ois'
+        unicode_text = 'Fran\u00E7ois'
         batch = BatchStatement(BatchType.LOGGED)
-        batch.add(u"INSERT INTO {0}.{1} (k, v) VALUES (%s, %s)".format(self.keyspace_name, self.function_table_name), (0, unicode_text))
+        batch.add("INSERT INTO {0}.{1} (k, v) VALUES (%s, %s)".format(self.keyspace_name, self.function_table_name), (0, unicode_text))
         self.session.execute(batch)
-        self.session.execute(u"INSERT INTO {0}.{1} (k, v) VALUES (%s, %s)".format(self.keyspace_name, self.function_table_name), (0, unicode_text))
-        prepared = self.session.prepare(u"INSERT INTO {0}.{1} (k, v) VALUES (?, ?)".format(self.keyspace_name, self.function_table_name))
+        self.session.execute("INSERT INTO {0}.{1} (k, v) VALUES (%s, %s)".format(self.keyspace_name, self.function_table_name), (0, unicode_text))
+        prepared = self.session.prepare("INSERT INTO {0}.{1} (k, v) VALUES (?, ?)".format(self.keyspace_name, self.function_table_name))
         bound = prepared.bind((1, unicode_text))
         self.session.execute(bound)