From 0cfb92aa4ae0b7bbd6a483b0916c84f9079c4944 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 4 Dec 2018 20:47:53 +0800
Subject: [PATCH] change httprunner api HttpRunner location to avoid monkey
 patch

---
 httprunner/__init__.py | 11 -----------
 httprunner/cli.py      |  3 +++
 tests/test_api.py      |  5 +++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/httprunner/__init__.py b/httprunner/__init__.py
index 7b64a3a9..e69de29b 100644
--- a/httprunner/__init__.py
+++ b/httprunner/__init__.py
@@ -1,11 +0,0 @@
-# encoding: utf-8
-
-try:
-    # monkey patch ssl at beginning to avoid RecursionError when running locust.
-    from gevent import monkey
-    if not monkey.is_module_patched('ssl'):
-        monkey.patch_ssl()
-except ImportError:
-    pass
-
-from httprunner.api import HttpRunner
diff --git a/httprunner/cli.py b/httprunner/cli.py
index e3aa5f73..5d758e6a 100644
--- a/httprunner/cli.py
+++ b/httprunner/cli.py
@@ -90,6 +90,9 @@ def main_hrun():
 def main_locust():
     """ Performance test with locust: parse command line options and run commands.
     """
+    # monkey patch ssl at beginning to avoid RecursionError when running locust.
+    from gevent import monkey; monkey.patch_ssl()
+
     import multiprocessing
     import sys
     from httprunner import logger
diff --git a/tests/test_api.py b/tests/test_api.py
index 52a472c8..fac7f6d7 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -3,7 +3,8 @@ import shutil
 import time
 import unittest
 
-from httprunner import HttpRunner, api, loader, parser
+from httprunner import loader, parser
+from httprunner.api import HttpRunner, prepare_locust_tests
 from locust import HttpLocust
 from tests.api_server import HTTPBIN_SERVER
 from tests.base import ApiServerUnittest
@@ -570,7 +571,7 @@ class TestLocust(unittest.TestCase):
     def test_prepare_locust_tests(self):
         path = os.path.join(
             os.getcwd(), 'tests/locust_tests/demo_simple_locust.yml')
-        locust_tests = api.prepare_locust_tests(path)
+        locust_tests = prepare_locust_tests(path)
         self.assertIn("gen_md5", locust_tests["functions"])
         self.assertEqual(len(locust_tests["tests"]), 10)
         self.assertEqual(locust_tests["tests"][0]["name"], "index")