summaryrefslogtreecommitdiff
path: root/Lib/tokenize.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-09 23:55:56 -0400
committerBenjamin Peterson <benjamin@python.org>2014-04-09 23:55:56 -0400
commit3f16b927b6791867124ec969049fde4d61df0157 (patch)
treea0afed1c59b2dcbdf53400494dbb95b97e51bb4f /Lib/tokenize.py
parent7c9eccdafad04f83ed061aeb5a43651eb5f44673 (diff)
downloadcpython-3f16b927b6791867124ec969049fde4d61df0157.tar.gz
PEP 465: a dedicated infix operator for matrix multiplication (closes #21176)
Diffstat (limited to 'Lib/tokenize.py')
-rw-r--r--Lib/tokenize.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 98e91223fe..742abd1992 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -91,7 +91,8 @@ EXACT_TOKEN_TYPES = {
'**=': DOUBLESTAREQUAL,
'//': DOUBLESLASH,
'//=': DOUBLESLASHEQUAL,
- '@': AT
+ '@': AT,
+ '@=': ATEQUAL,
}
class TokenInfo(collections.namedtuple('TokenInfo', 'type string start end line')):
@@ -150,7 +151,7 @@ String = group(StringPrefix + r"'[^\n'\\]*(?:\\.[^\n'\\]*)*'",
# recognized as two instances of =).
Operator = group(r"\*\*=?", r">>=?", r"<<=?", r"!=",
r"//=?", r"->",
- r"[+\-*/%&|^=<>]=?",
+ r"[+\-*/%&@|^=<>]=?",
r"~")
Bracket = '[][(){}]'