Merge pull request #64 from nazrulworld/master

Issue #63 Now ensuring we unicode string value would work for both py…

collective/elasticsearch/es.py

@@ -82,7 +82,7 @@ def __getitem__(self, key):
                 raise IndexError
 
             if key >= 0:
-                result_key = (key / self.bulk_size) * self.bulk_size
+                result_key = int(key / self.bulk_size) * self.bulk_size
                 start = result_key
                 result_index = key % self.bulk_size
             elif key < 0:

collective/elasticsearch/hook.py

@@ -16,6 +16,7 @@
 
 import logging
 import random
+import six
 import time
 import traceback
 import transaction
@@ -161,8 +162,12 @@ def get_index_data(obj, es):
 
             # Ignore errors in converting to unicode, so json.dumps
             # does not barf when we're trying to send data to ES.
-            if isinstance(value, str):
-                value = unicode(value, 'utf-8', 'ignore')
+            if six.PY2:
+                if isinstance(value, str):
+                    value = six.text_type(value, 'utf-8', 'ignore')
+            else:
+                if isinstance(value, bytes):
+                    value = value.decode('utf-8', 'ignore')
 
             index_data[index_name] = value
 
@@ -175,8 +180,12 @@ def get_index_data(obj, es):
         if indexer is not None:
             try:
                 val = indexer()
-                if isinstance(value, str):
-                    val = unicode(val, 'utf-8', 'ignore')
+                if six.PY2:
+                    if isinstance(value, str):
+                        value = six.text_type(value, 'utf-8', 'ignore')
+                else:
+                    if isinstance(value, bytes):
+                        value = value.decode('utf-8', 'ignore')
                 index_data[name] = val
             except Exception:
                 logger.error('Error indexing value: %s: %s\n%s' % (

docs/history.rst

@@ -4,6 +4,8 @@ Changelog
 3.0.4 (unreleased)
 ------------------
 
+- `Issue#63 <https://github.com/collective/collective.elasticsearch/issues/63>`_ Now ensuring unicode value would for both python2 and python3 case. [nazrulworld]
+
 - Now possible to search by other than `Title`, `Description` and `SearchableText` indexes. [nazrulworld]