From 2b3e285fb615ef86997ec05d01a3732b56f3e97e Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 20 Mar 2018 10:49:06 +0100
Subject: [PATCH 1/3] Match Elasticsearch __init__ signature in
 FakeElasticSearch

Fortunately it hasn't changed from 1.1 to latest master.
---
 elasticmock/fake_elasticsearch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elasticmock/fake_elasticsearch.py b/elasticmock/fake_elasticsearch.py
index ee09176..a262467 100644
--- a/elasticmock/fake_elasticsearch.py
+++ b/elasticmock/fake_elasticsearch.py
@@ -12,7 +12,7 @@
 class FakeElasticsearch(Elasticsearch):
     __documents_dict = None
 
-    def __init__(self):
+    def __init__(self, hosts=None, transport_class=None, **kwargs):
         self.__documents_dict = {}
 
     @query_params()

From 6b1cb214ebb93e24bc439766202735792aac0b75 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 20 Mar 2018 10:57:51 +0100
Subject: [PATCH 2/3] Make FakeElasticsearch work with modern python 3

As unicode() is not there anymore
---
 elasticmock/fake_elasticsearch.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/elasticmock/fake_elasticsearch.py b/elasticmock/fake_elasticsearch.py
index a262467..dd1e5aa 100644
--- a/elasticmock/fake_elasticsearch.py
+++ b/elasticmock/fake_elasticsearch.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
+import sys
 
 from elasticsearch import Elasticsearch
 from elasticsearch.client.utils import query_params
@@ -9,6 +10,11 @@
 from elasticmock.utilities import get_random_id
 
 
+PY3 = sys.version_info[0] == 3
+if PY3:
+    unicode = str
+
+
 class FakeElasticsearch(Elasticsearch):
     __documents_dict = None
 

From 63018b47adf7b24cdcf181d235bb9aab0f0a9837 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 20 Mar 2018 11:08:22 +0100
Subject: [PATCH 3/3] Test on python 3.6 too

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9c80b9a..b8dc758 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: python
 python:
   - "2.7"
+  - "3.6"
 install:
   - pip install -r requirements.txt
   - pip install -r requirements_test.txt
@@ -8,4 +9,4 @@ install:
 script:
   make test
 after_success:
-  coveralls
\ No newline at end of file
+  coveralls