diff --git a/requirements.txt b/requirements.txt index 2a251b2ba..2acf98261 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ Flask==3.0.* Flask-Login==0.* Flask-Mail==0.* Flask-Migrate==4.* -greenlet==1.1.2; python_version <= '3.10' Flask-SQLAlchemy==3.1.* Flask-WTF==1.2.* Flask-Compress==1.* @@ -36,7 +35,6 @@ cryptography==43.0.* sshtunnel==0.* ldap3==2.* gssapi==1.9.* -eventlet==0.37.0 user-agents==2.2.0 pywinpty==2.0.*; sys_platform=="win32" Authlib==1.3.* diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py index 6307dc87e..19b9d61c7 100644 --- a/web/pgAdmin4.py +++ b/web/pgAdmin4.py @@ -35,16 +35,6 @@ if 'PGADMIN_SERVER_MODE' in os.environ: else: builtins.SERVER_MODE = None -if (3, 10) > sys.version_info > (3, 8, 99) and os.name == 'posix': - # Fix eventlet issue with Python 3.9. - # Ref: https://github.com/eventlet/eventlet/issues/670 - # This was causing issue in psycopg3 - from eventlet import hubs - hubs.use_hub("poll") - - import selectors - selectors.DefaultSelector = selectors.PollSelector - import config import setup from pgadmin import create_app, socketio diff --git a/web/pgadmin/tools/psql/__init__.py b/web/pgadmin/tools/psql/__init__.py index 772363b72..52bd33a0e 100644 --- a/web/pgadmin/tools/psql/__init__.py +++ b/web/pgadmin/tools/psql/__init__.py @@ -12,7 +12,7 @@ import select import struct import config import re -from eventlet.green import subprocess +import subprocess from sys import platform as _platform from config import PG_DEFAULT_DRIVER from flask import Response, request