Merge pull request #42 from xros/dev

Dev

README.md

@@ -1,6 +1,7 @@
 json-py-es
 ==========
 
+[![Downloads](https://pepy.tech/badge/jsonpyes)](https://pepy.tech/project/jsonpyes)
 [![Build Status](https://travis-ci.org/xros/jsonpyes.svg?branch=master)](https://travis-ci.org/xros/jsonpyes)
 [![GitHub release](https://img.shields.io/github/release/xros/jsonpyes.svg)](https://github.com/xros/jsonpyes/releases)
 [![GitHub license](https://img.shields.io/github/license/xros/jsonpyes.svg)](https://github.com/xros/jsonpyes/blob/master/LICENSE)
@@ -104,6 +105,6 @@ Reference
 ---------
 * Algorithm handwritting
 
-![handwritting](http://i.imgur.com/fgm1Mxt.jpg?1)
+![handwritting](https://raw.githubusercontent.com/xros/jsonpyes/master/static/algo.png)
 
 ##### Happy hacking!

README.rst

@@ -1,7 +1,7 @@
 json-py-es
 ==========
 
-|Build Status| |GitHub release| |GitHub license|
+|Downloads| |Build Status| |GitHub release| |GitHub license|
 
 Alexander Liu
 
@@ -144,14 +144,16 @@ Reference
 
 -  Algorithm handwritting
 
-.. figure:: http://i.imgur.com/fgm1Mxt.jpg?1
+.. figure:: https://raw.githubusercontent.com/xros/jsonpyes/master/static/algo.png
    :alt: handwritting
 
    handwritting
 
 Happy hacking!
 ''''''''''''''
 
+.. |Downloads| image:: https://pepy.tech/badge/jsonpyes
+   :target: https://pepy.tech/project/jsonpyes
 .. |Build Status| image:: https://travis-ci.org/xros/jsonpyes.svg?branch=master
    :target: https://travis-ci.org/xros/jsonpyes
 .. |GitHub release| image:: https://img.shields.io/github/release/xros/jsonpyes.svg

jsonpyes.egg-info/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.1
 Name: jsonpyes
-Version: 1.4.1
+Version: 1.4.2
 Summary: A Tool to Import JSON raw data to ElasticSearch in one line of commands
 Home-page: https://github.com/xros/jsonpyes
 Author: Alexander Liu
 Author-email: alex@nervey.com
 License: FTE V1
-Download-URL: https://github.com/xros/jsonpyes/archive/1.4.1.zip
+Download-URL: https://github.com/xros/jsonpyes/archive/1.4.2.zip
 Description: json-py-es
         ==========
 
+        [![Downloads](https://pepy.tech/badge/jsonpyes)](https://pepy.tech/project/jsonpyes)
         [![Build Status](https://travis-ci.org/xros/jsonpyes.svg?branch=master)](https://travis-ci.org/xros/jsonpyes)
         [![GitHub release](https://img.shields.io/github/release/xros/jsonpyes.svg)](https://github.com/xros/jsonpyes/releases)
         [![GitHub license](https://img.shields.io/github/license/xros/jsonpyes.svg)](https://github.com/xros/jsonpyes/blob/master/LICENSE)
@@ -113,7 +114,7 @@ Description: json-py-es
         ---------
         * Algorithm handwritting
 
-        ![handwritting](http://i.imgur.com/fgm1Mxt.jpg?1)
+        ![handwritting](https://raw.githubusercontent.com/xros/jsonpyes/master/static/algo.png)
 
         ##### Happy hacking!
 

jsonpyes.py

@@ -406,19 +406,21 @@ def run():
         doc_type = ""
         thread_amount = 1
         # Get info from process_jobs
+        # fix the syntax bug after upgrading support from Python2.7 to Python3.6, thanks to @tdracz
         for job in process_jobs:
             if type(job) == dict:
-                if job.has_key('data'):
+                if 'data' in job:
                     data = job['data']
-                if job.has_key('bulk'):
+                if 'bulk' in job:
                     bulk = job['bulk']
-                if job.has_key('index'):
+                if 'index' in job:
                     index = job['index']
-                if job.has_key('type'):
+                if 'type' in job:
                     doc_type = job['type']
-                if job.has_key('thread'):
+                if 'thread' in job:
                     thread_amount = int(job['thread_amount'])
 
+
         #### 1) Only check not importing
         if ("check" in process_jobs) and ("import" not in process_jobs) :
             # check JSON

jsonpyes_contrib/__init__.py

@@ -1,4 +1,4 @@
 """
 """
 # version number like 1.2.3a0 or 1.2.3, must have at least 2 parts, like 1.2  
-__version__ = '1.4.1'
+__version__ = '1.4.2'