Skip to content

Commit e75ac15

Browse files
recursiveMakehonzakral
authored andcommitted
Use string_types for string check (elastic#795)
Fixes elastic#792
1 parent e10df98 commit e75ac15

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

elasticsearch_dsl/search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def index(self, *index):
147147
else:
148148
indexes = []
149149
for i in index:
150-
if isinstance(i, str):
150+
if isinstance(i, string_types):
151151
indexes.append(i)
152152
elif isinstance(i, list):
153153
indexes += i

test_elasticsearch_dsl/test_search.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ def test_search_index():
162162
assert s._index == ['i']
163163
s = s.index('i2')
164164
assert s._index == ['i', 'i2']
165+
s = s.index(u'i3')
166+
assert s._index == ['i', 'i2', 'i3']
165167
s = s.index()
166168
assert s._index is None
167169
s = search.Search(index=('i', 'i2'))

0 commit comments

Comments
 (0)