Fix "NameError: name 'unicode' is not defined" in python3

This commit is contained in:
Marsel 2017-05-14 23:11:58 +03:00
parent 1ff2fe512b
commit 1ff82a57e1

View File

@ -2,6 +2,7 @@
import unittest import unittest
import six
from infi.clickhouse_orm.database import Database, DatabaseException from infi.clickhouse_orm.database import Database, DatabaseException
from infi.clickhouse_orm.models import Model from infi.clickhouse_orm.models import Model
from infi.clickhouse_orm.fields import * from infi.clickhouse_orm.fields import *
@ -25,7 +26,7 @@ class ReadonlyTestCase(TestCaseWithData):
with self.assertRaises(DatabaseException): with self.assertRaises(DatabaseException):
self.database.drop_database() self.database.drop_database()
except DatabaseException as e: except DatabaseException as e:
if 'Unknown user' in unicode(e): if 'Unknown user' in six.text_type(e):
raise unittest.SkipTest('Database user "%s" is not defined' % username) raise unittest.SkipTest('Database user "%s" is not defined' % username)
else: else:
raise raise
@ -56,4 +57,3 @@ class ReadOnlyModel(Model):
readonly = True readonly = True
name = StringField() name = StringField()