floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#2953 fix comments: use keyword module

This commit is contained in:
feuillemorte 2018-01-16 22:55:24 +03:00
parent 076fb56f85
commit 648d5d0c6b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_pytest/mark.py
View File

@ -2,6 +2,7 @@
from __future__ import absolute_import, division, print_function from __future__ import absolute_import, division, print_function
import inspect import inspect
import keyword
import warnings import warnings
import attr import attr
from collections import namedtuple from collections import namedtuple
@ -222,10 +223,7 @@ class KeywordMapping(object):
return False return False
# python keywords except or, and, not python_keywords_allowed_list = ["or", "and", "not"]
python_keywords_list = ["False", "None", "True", "as", "assert", "break", "class", "continue", "def", "del",
"elif", "else", "except", "finally", "for", "from", "global", "if", "import", "in", "is",
"lambda", "nonlocal", "pass", "raise", "return", "try", "while", "with", "yield"]
def matchmark(colitem, markexpr): def matchmark(colitem, markexpr):
@ -265,9 +263,9 @@ def matchkeyword(colitem, keywordexpr):
return mapping[keywordexpr] return mapping[keywordexpr]
elif keywordexpr.startswith("not ") and " " not in keywordexpr[4:]: elif keywordexpr.startswith("not ") and " " not in keywordexpr[4:]:
return not mapping[keywordexpr[4:]] return not mapping[keywordexpr[4:]]
for keyword in keywordexpr.split(): for kwd in keywordexpr.split():
if keyword in python_keywords_list: if keyword.iskeyword(kwd) and kwd not in python_keywords_allowed_list:
raise AttributeError("Python keyword '{}' not accepted in expressions passed to '-k'".format(keyword)) raise AttributeError("Python keyword '{}' not accepted in expressions passed to '-k'".format(kwd))
try: try:
return eval(keywordexpr, {}, mapping) return eval(keywordexpr, {}, mapping)
except SyntaxError: except SyntaxError: