Include unicode_literals

src/infi/clickhouse_orm/database.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import requests
 from collections import namedtuple
 from .models import ModelBase

src/infi/clickhouse_orm/engines.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .utils import comma_join
 
 

src/infi/clickhouse_orm/fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from six import string_types, text_type, binary_type
 import datetime
 import pytz

src/infi/clickhouse_orm/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from logging import getLogger
 
 from six import with_metaclass
@@ -18,7 +19,7 @@ class ModelBase(type):
     ad_hoc_model_cache = {}
 
     def __new__(cls, name, bases, attrs):
-        new_cls = super(ModelBase, cls).__new__(cls, name, bases, attrs)
+        new_cls = super(ModelBase, cls).__new__(cls, str(name), bases, attrs)
         # Collect fields from parent classes
         base_fields = []
         for base in bases:

src/infi/clickhouse_orm/query.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import six
 import pytz
 from copy import copy
@@ -167,6 +168,7 @@ class Q(object):
         return q
 
 
+@six.python_2_unicode_compatible
 class QuerySet(object):
     """
     A queryset is an object that represents a database query using a specific `Model`.
@@ -201,7 +203,7 @@ class QuerySet(object):
     def __nonzero__(self):      # Python 2 compatibility
         return type(self).__bool__(self)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.as_sql()
 
     def __getitem__(self, s):
@@ -210,7 +212,7 @@ class QuerySet(object):
             assert s >= 0, 'negative indexes are not supported'
             qs = copy(self)
             qs._limits = (s, 1)
-            return next(iter(qs))
+            return six.next(iter(qs))
         else:
             # Slice
             assert s.step in (None, 1), 'step is not supported in slices'

src/infi/clickhouse_orm/system_models.py

@@ -2,6 +2,7 @@
 This file contains system readonly models that can be got from database
 https://clickhouse.yandex/reference_en.html#System tables
 """
+from __future__ import unicode_literals
 from six import string_types
 
 from .database import Database

src/infi/clickhouse_orm/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from six import string_types, binary_type, text_type, PY3
 import codecs
 import re
@@ -43,7 +44,7 @@ def parse_tsv(line):
         line = line.decode()
     if line and line[-1] == '\n':
         line = line[:-1]
-    return [unescape(value) for value in line.split('\t')]
+    return [unescape(value) for value in line.split(b'\t')]
 
 
 def parse_array(array_string):

tests/base_test_with_data.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.database import Database

tests/test_alias_fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 from datetime import date
 
@@ -65,5 +66,3 @@ class ModelWithAliasFields(Model):
     alias_date = DateField(alias='date_field')
 
     engine = MergeTree('date_field', ('date_field',))
-
-

tests/test_array_fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 from datetime import date
 
@@ -70,4 +71,3 @@ class ModelWithArrays(Model):
     arr_date = ArrayField(DateField())
 
     engine = MergeTree('date_field', ('date_field',))
-

tests/test_buffer.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.models import BufferModel
@@ -25,5 +25,3 @@ class BufferTestCase(TestCaseWithData):
 class PersonBuffer(BufferModel, Person):
 
     engine = Buffer(Person)
-
-

tests/test_database.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.database import Database, DatabaseException

tests/test_engines.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.database import Database, DatabaseException

tests/test_enum_fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.database import Database

tests/test_fixed_string_fields.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.database import Database

tests/test_inheritance.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 import datetime
 import pytz
@@ -49,4 +50,3 @@ class Model1(ParentModel):
 class Model2(ParentModel):
 
     float_field = Float32Field()
-

tests/test_materialized_fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 from datetime import date
 
@@ -65,5 +66,3 @@ class ModelWithMaterializedFields(Model):
     mat_date = DateField(materialized=u'toDate(date_time_field)')
 
     engine = MergeTree('mat_date', ('mat_date',))
-
-

tests/test_migrations.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 
 from infi.clickhouse_orm.database import Database

tests/test_models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 import datetime
 import pytz
@@ -89,4 +90,3 @@ class SimpleModel(Model):
     alias_field = Float32Field(alias='float_field')
 
     engine = MergeTree('date_field', ('int_field', 'date_field'))
-

tests/test_nullable_fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 import pytz
 

tests/test_querysets.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals, print_function
 import unittest
 
 from infi.clickhouse_orm.database import Database

tests/test_readonly.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 import unittest
 
 import six

tests/test_simple_fields.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 from infi.clickhouse_orm.fields import *
 from datetime import date, datetime

tests/test_system_models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 from datetime import date
 import os