From 30ea8f929ef0ed3a7364885646a130a1f7979761 Mon Sep 17 00:00:00 2001
From: JesseyXujin <xu.jinxujinxujin@163.com>
Date: Tue, 31 Dec 2019 15:03:14 +0800
Subject: [PATCH] Simplify Paddle import check (#795)

---
 jieba/_compat.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jieba/_compat.py b/jieba/_compat.py
index 10b3fa0..a3ab07a 100755
--- a/jieba/_compat.py
+++ b/jieba/_compat.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
-import importlib
 import logging
 
 log_console = logging.StreamHandler(sys.stderr)
@@ -30,7 +29,7 @@ def import_paddle():
                              "Now, back to jieba basic cut......")
         return False
     try:
-        if paddle.__version__ >= '1.6.1' or paddle.__version__ >= u'1.6.1':
+        if paddle.__version__ >= '1.6.1':
             import paddle.fluid as fluid
             import jieba.lac_small.predict as predict
             import_paddle_check = True
@@ -81,9 +80,9 @@ def check_paddle_install():
     is_paddle_installed =  False
     try:
         import paddle
-        if importlib.find_module('paddle') and (paddle.__version__ >= '1.6.1' or paddle.__version__ >= u'1.6.1'):
+        if paddle.__version__ >= '1.6.1':
             is_paddle_installed = True
-        elif paddle.__version__ < '1.6.1':
+        else:
             is_paddle_installed = False
             default_logger.debug("Check the paddle version is not correct, the current version is "+ paddle.__version__+","
             "please use command to install paddle: pip uninstall paddlepaddle(-gpu), "