From 91c5556f2135f8548e6d1a1e4ee63817f3ae1276 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 16 Mar 2019 02:05:27 +0100 Subject: [PATCH] Remove old gevent compatibility patches --- src/main.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main.py b/src/main.py index 9bce4f3d..818ed8a2 100644 --- a/src/main.py +++ b/src/main.py @@ -8,16 +8,8 @@ import logging # Third party modules import gevent -from gevent import monkey -if "patch_subprocess" in dir(monkey): # New gevent - monkey.patch_all(thread=False, subprocess=False) -else: # Old gevent - import ssl - # Fix PROTOCOL_SSLv3 not defined - if "PROTOCOL_SSLv3" not in dir(ssl): - ssl.PROTOCOL_SSLv3 = ssl.PROTOCOL_SSLv23 - monkey.patch_all(thread=False) -# Not thread: pyfilesystem and systray icon, Not subprocess: Gevent 1.1+ +import gevent.monkey +gevent.monkey.patch_all(thread=False, subprocess=False) update_after_shutdown = False # If set True then update and restart zeronet after main loop ended restart_after_shutdown = False # If set True then restart zeronet after main loop ended