fix gevent patch in py3.6

soraxas · May 29, 2020 · a3a6753 · a3a6753
1 parent 4706f78
commit a3a6753
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/echo360/hls_downloader.py b/echo360/hls_downloader.py
@@ -1,6 +1,3 @@
-from gevent import monkey
-monkey.patch_all()
-from gevent.pool import Pool
 import ffmpy
 import gevent
 import requests

diff --git a/echo360/main.py b/echo360/main.py
@@ -232,6 +232,10 @@ def cmd_exists(x):
                                 course_url).group()  # retrieve the last part of the URL
         course = EchoCloudCourse(course_uuid, course_hostname)
     else:
+        # import it here for monkey patching gevent, to fix the followings:
+        # MonkeyPatchWarning: Monkey-patching ssl after ssl has already been 
+        # imported may lead to errors, including RecursionError on Python 3.6.
+        from . import hls_downloader
         course_uuid = re.search('[^/]+(?=/$|$)',
                                 course_url).group()  # retrieve the last part of the URL
         course = EchoCourse(course_uuid, course_hostname)

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     platforms='linux, macos, windows',
     entry_points={
     'console_scripts': [
-        'echo360download=echo360.main:main',
+        'echo360-download=echo360.main:main',
         ],
         },
     package_data={'echo360': ['*.py']},