From ade1df52a2ae06d8cd0e704327ac0a6ae2d16746 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Thu, 30 May 2019 18:14:40 -0400 Subject: [PATCH] Use "feature detection" for 3.8 compat (#3278) --- beets/util/functemplate.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py index 79dcb9ad4..af22b7908 100644 --- a/beets/util/functemplate.py +++ b/beets/util/functemplate.py @@ -125,21 +125,16 @@ def compile_func(arg_names, statements, name='_the_func', debug=False): kwarg=None, defaults=[ex_literal(None) for _ in arg_names], ) - elif sys.version_info >= (3, 8): - args = ast.arguments( - args=[ast.arg(arg=n, annotation=None) for n in arg_names], - posonlyargs=[], - kwonlyargs=[], - kw_defaults=[], - defaults=[ex_literal(None) for _ in arg_names], - ) else: - args = ast.arguments( - args=[ast.arg(arg=n, annotation=None) for n in arg_names], - kwonlyargs=[], - kw_defaults=[], - defaults=[ex_literal(None) for _ in arg_names], - ) + args_fields = { + 'args': [ast.arg(arg=n, annotation=None) for n in arg_names], + 'kwonlyargs': [], + 'kw_defaults': [], + 'defaults': [ex_literal(None) for _ in arg_names], + } + if 'posonlyargs' in ast.arguments._fields: # Added in Python 3.8. + args_fields['posonlyargs'] = [] + args = ast.arguments(**args_fields) func_def = ast.FunctionDef( name=name,