Remove support for Python2.7+

https://www.python.org/dev/peps/pep-0373/ Good bye Python2
d-sergienko · Oct 21, 2019 · 74040d5 · 74040d5
1 parent 54c97e0
commit 74040d5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@ All notable changes to QPanel will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## 0.17.0  (unrelased)
+## 1.0.0  (unrelased)
+
+
+### Changed
+- Remove Python2.7 Support
 
 ### Fixed
 - Support Redis version >= 3.0 for Reset stats jobs

diff --git a/README.md b/README.md
@@ -48,8 +48,7 @@ Also you can use a [API of QPanel](doc/api.md) for data query related to queues
 
 
 ## Requirement
- * Python 2.7, 3.4
- * [Flask](http://flask.pocoo.org/) 0.10+
+ * Python 3.4+
  * [Asterisk](http://www.asterisk.org) 1.4+ and enabled manager or [FreeSWITCH](http://www.freeswitch.org) and connection permission to Event Socket Library.
 
   The feature to scheduler reset stats a queue is required Redis Redis >= 2.6.0

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.16.1
+1.0.0-dev
diff --git a/qpanel/app.py b/qpanel/app.py
@@ -22,12 +22,6 @@
 if QPanelConfig().has_queuelog_config():
     from qpanel.model import queuelog_data_queue
 
-import sys
-PY2 = sys.version_info[0] == 2
-
-if PY2: # Python 3 has not setdefaultencoding and UTF-8 is default
-    reload(sys)
-    sys.setdefaultencoding('utf-8')
 
 class User(flask_login.UserMixin):
     pass
@@ -417,15 +411,6 @@ def main():
             print("Error: There not connection to Redis")
             print("       Reset stats will not work\n")
 
-    if PY2:
-        # This change is a fix for issue with Python 2.7
-        # The error is IOError: [Errno 32] Broken pipe
-        # All this shit happend if the connection is closed early
-        # by remove client (browser)
-        # Long story https://github.com/pallets/werkzeug/issues/954
-        from gevent.wsgi import WSGIServer
-        http_server = WSGIServer((cfg.host_bind, cfg.port_bind), app)
-        http_server.serve_forever()
 
     if cfg.base_url == '/':
         app.run(host=cfg.host_bind, port=cfg.port_bind, use_reloader=reloader,

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -10,4 +10,3 @@ future
 rq-scheduler==0.9.0
 python-ESL==1.4.18
 git+git://github.com/maxcountryman/flask-themes@9eac2dc#egg=Flask-Themes
-gevent==1.1.2
diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
-envlist = py27,py33,py34,py35,py36
+envlist = py33,py34,py35,py36
 skipsdist = True
 
 [testenv]
 commands =
  py.test --verbose tests
 deps =
- -rrequirements/development.txt
+ -rrequirements/development.txt