diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-10 04:15:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-10 04:15:34 (GMT) |
| commit | 8b4c7ed6eb075e6ebb479e64ee77820607d6d3b7 (patch) | |
| tree | 20350eb0d194c64a6409107abab7b11f427f24a5 /Lib/lib2to3/pgen2/tokenize.py | |
| parent | d51374ed78a3e3145911a16cdf3b9b84b3ba7d15 (diff) | |
| parent | 4ab92c800a6f2b75743d4a0b4dfd9995723f3647 (diff) | |
| download | cpython-8b4c7ed6eb075e6ebb479e64ee77820607d6d3b7.zip cpython-8b4c7ed6eb075e6ebb479e64ee77820607d6d3b7.tar.gz cpython-8b4c7ed6eb075e6ebb479e64ee77820607d6d3b7.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Lib/lib2to3/pgen2/tokenize.py')
| -rw-r--r-- | Lib/lib2to3/pgen2/tokenize.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py index 1bb931e..3dd1ee9 100644 --- a/Lib/lib2to3/pgen2/tokenize.py +++ b/Lib/lib2to3/pgen2/tokenize.py @@ -84,7 +84,7 @@ String = group(r"[uU]?[rR]?'[^\n'\\]*(?:\\.[^\n'\\]*)*'", # recognized as two instances of =). Operator = group(r"\*\*=?", r">>=?", r"<<=?", r"<>", r"!=", r"//=?", r"->", - r"[+\-*/%&|^=<>]=?", + r"[+\-*/%&@|^=<>]=?", r"~") Bracket = '[][(){}]' |