Merge branch 'master' into oss-next

Author: aboudreault

CHANGELOG.rst

@@ -80,6 +80,10 @@ Other
 * Write documentation examples for DSE 2.0 features (PYTHON-732)
 * DSE_V1 protocol should not include all of protocol v5 (PYTHON-694)
 
+Bug Fixes
+---------
+* re-raising the CQLEngineException will fail on Python 3 (PYTHON-1166)
+
 3.20.1
 ======
 November 6, 2019

cassandra/cqlengine/management.py

@@ -232,7 +232,7 @@ def _sync_table(model, connection=None):
         except CQLEngineException as ex:
             # 1.2 doesn't return cf names, so we have to examine the exception
             # and ignore if it says the column family already exists
-            if "Cannot add already existing column family" not in unicode(ex):
+            if "Cannot add already existing column family" not in six.text_type(ex):
                 raise
     else:
         log.debug(format_log_context("sync_table checking existing table %s", keyspace=ks_name, connection=connection), cf_name)