From c084caf492e840991f7367063291d068461f8a4d Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Fri, 4 Sep 2020 16:43:51 +0200 Subject: server.py: Add python3 shebang --- server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server.py b/server.py index 072ed22..4de2bf5 100644 --- a/server.py +++ b/server.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 from gevent import monkey monkey.patch_all() import gevent.socket -- cgit v1.2.3 From 799177d651e59c7186ea4ee4346d4dd6e4a174b2 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sat, 5 Sep 2020 20:41:21 +0200 Subject: settings.py: Support newer `ast.Constant' for settings.txt file. In python 3.8, specific constant AST types are removed in favor of ast.Constant. This change should work for both cases. See https://bugs.python.org/issue32892 for the given rationale. --- settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.py b/settings.py index 517e785..7e988f7 100644 --- a/settings.py +++ b/settings.py @@ -235,6 +235,7 @@ else: # parse settings in a safe way, without exec settings = {} attributes = { + ast.Constant: 'value', ast.NameConstant: 'value', ast.Num: 'n', ast.Str: 's', @@ -258,7 +259,7 @@ else: log_ignored_line(node.lineno, target.id + " is not a valid setting") continue - if type(node.value) not in (ast.NameConstant, ast.Num, ast.Str): + if type(node.value) not in attributes: log_ignored_line(node.lineno, "only literals allowed for values") continue -- cgit v1.2.3