summaryrefslogtreecommitdiff
path: root/pygments/lexers/python.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2015-10-13 13:10:32 -0700
committerTim Hatch <tim@timhatch.com>2015-10-13 13:10:32 -0700
commit2f7cbe6eb3613403a6045e58e34cc0139aa1a4e2 (patch)
tree490a00a49a53d9e79467a8ebab6082573bb68b12 /pygments/lexers/python.py
parenta5205cb7fad042a4bba84d02800f9797e8a256af (diff)
parent139903623c6f3c718407f1716c01baf4a6466ea7 (diff)
downloadpygments-2f7cbe6eb3613403a6045e58e34cc0139aa1a4e2.tar.gz
Merged in hrach/pygments-main/hrach/graph-lexer-added-support-for-nondirecte-1427233062637 (pull request #461)
graph lexer: added support for non-directed relationship in cypher
Diffstat (limited to 'pygments/lexers/python.py')
-rw-r--r--pygments/lexers/python.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/pygments/lexers/python.py b/pygments/lexers/python.py
index 49c15b6d..ea97b855 100644
--- a/pygments/lexers/python.py
+++ b/pygments/lexers/python.py
@@ -215,10 +215,10 @@ class Python3Lexer(RegexLexer):
tokens = PythonLexer.tokens.copy()
tokens['keywords'] = [
(words((
- 'assert', 'break', 'continue', 'del', 'elif', 'else', 'except',
- 'finally', 'for', 'global', 'if', 'lambda', 'pass', 'raise',
- 'nonlocal', 'return', 'try', 'while', 'yield', 'yield from', 'as',
- 'with'), suffix=r'\b'),
+ 'assert', 'async', 'await', 'break', 'continue', 'del', 'elif',
+ 'else', 'except', 'finally', 'for', 'global', 'if', 'lambda', 'pass',
+ 'raise', 'nonlocal', 'return', 'try', 'while', 'yield', 'yield from',
+ 'as', 'with'), suffix=r'\b'),
Keyword),
(words((
'True', 'False', 'None'), suffix=r'\b'),
@@ -272,6 +272,7 @@ class Python3Lexer(RegexLexer):
tokens['backtick'] = []
tokens['name'] = [
(r'@\w+', Name.Decorator),
+ (r'@', Operator), # new matrix multiplication operator
(uni_name, Name),
]
tokens['funcname'] = [