eric: comparison eric6/ThirdParty/Pygments/pygments/lexers/python.py

-:a3cf077a8db3
+:25f42e208e08
 pygments.lexers.python
 ~~~~~~~~~~~~~~~~~~~~~~
 Lexers for Python and related languages.
-:copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
+:copyright: Copyright 2006-2020 by the Pygments team, see AUTHORS.
 :license: BSD, see LICENSE for details.
 """
 import re
 'expr-inside-fstring': [
 (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
 # without format specifier
 (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
 r'(\![sraf])?'     # conversion
-r'}', String.Interpol, '#pop'),
+r'\}', String.Interpol, '#pop'),
 # with format specifier
 # we'll catch the remaining '}' in the outer scope
 (r'(=\s*)?'         # debug (https://bugs.python.org/issue36817)
 r'(\![sraf])?'     # conversion
 r':', String.Interpol, '#pop'),
-(r'[^\S]+', Text),  # allow new lines
+(r'\s+', Text),  # allow new lines
 include('expr'),
 ],
 'expr-inside-fstring-inner': [
 (r'[{([]', Punctuation, 'expr-inside-fstring-inner'),
 (r'[])}]', Punctuation, '#pop'),
-(r'[^\S]+', Text),  # allow new lines
+(r'\s+', Text),  # allow new lines
 include('expr'),
 ],
 'expr-keywords': [
 # Based on https://docs.python.org/3/reference/expressions.html
 (words((
 (words(('True', 'False', 'None'), suffix=r'\b'), Keyword.Constant),
 ],
 'builtins': [
 (words((
 '__import__', 'abs', 'all', 'any', 'bin', 'bool', 'bytearray',
-'bytes', 'chr', 'classmethod', 'cmp', 'compile', 'complex',
+'bytes', 'chr', 'classmethod', 'compile', 'complex',
 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'filter',
 'float', 'format', 'frozenset', 'getattr', 'globals', 'hasattr',
 'hash', 'hex', 'id', 'input', 'int', 'isinstance', 'issubclass',
 'iter', 'len', 'list', 'locals', 'map', 'max', 'memoryview',
 'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print',
 (r'None\b', Name.Builtin.Pseudo, '#pop'),
 (uni_name, Name.Namespace),
 default('#pop'),
 ],
 'fstringescape': [
-('{{', String.Escape),
+(r'\{\{', String.Escape),
-('}}', String.Escape),
+(r'\}\}', String.Escape),
 include('stringescape'),
 ],
 'stringescape': [
 (r'\\([\\abfnrtv"\']|\n|N\{.*?\}|u[a-fA-F0-9]{4}|'
 r'U[a-fA-F0-9]{8}|x[a-fA-F0-9]{2}|[0-7]{1,3})', String.Escape)
 curtb = ''
 tbindex = 0
 tb = 0
 for match in line_re.finditer(text):
 line = match.group()
-if line.startswith(u'>>> ') or line.startswith(u'... '):
+if line.startswith('>>> ') or line.startswith('... '):
 tb = 0
 insertions.append((len(curcode),
 [(0, Generic.Prompt, line[:4])]))
 curcode += line[4:]
-elif line.rstrip() == u'...' and not tb:
+elif line.rstrip() == '...' and not tb:
 # only a new >>> prompt can end an exception block
 # otherwise an ellipsis in place of the traceback frames
 # will be mishandled
 insertions.append((len(curcode),
-[(0, Generic.Prompt, u'...')]))
+[(0, Generic.Prompt, '...')]))
 curcode += line[3:]
 else:
 if curcode:
-for item in do_insertions(
+yield from do_insertions(
-insertions, pylexer.get_tokens_unprocessed(curcode)):
+insertions, pylexer.get_tokens_unprocessed(curcode))
-yield item
 curcode = ''
 insertions = []
-if (line.startswith(u'Traceback (most recent call last):') or
+if (line.startswith('Traceback (most recent call last):') or
-re.match(u'  File "[^"]+", line \\d+\\n$', line)):
+re.match('  File "[^"]+", line \\d+\\n$', line)):
 tb = 1
 curtb = line
 tbindex = match.start()
 elif line == 'KeyboardInterrupt\n':
 yield match.start(), Name.Class, line
 elif tb:
 curtb += line
-if not (line.startswith(' ') or line.strip() == u'...'):
+if not (line.startswith(' ') or line.strip() == '...'):
 tb = 0
 for i, t, v in tblexer.get_tokens_unprocessed(curtb):
 yield tbindex+i, t, v
 curtb = ''
 else:
 yield match.start(), Generic.Output, line
 if curcode:
-for item in do_insertions(insertions,
+yield from do_insertions(insertions,
-pylexer.get_tokens_unprocessed(curcode)):
+pylexer.get_tokens_unprocessed(curcode))
-yield item
 if curtb:
 for i, t, v in tblexer.get_tokens_unprocessed(curtb):
 yield tbindex+i, t, v
 include('name'),
 include('numbers'),
 ],
 'keywords': [
 (words((
-'assert', 'break', 'by', 'continue', 'ctypedef', 'del', 'elif',
+'assert', 'async', 'await', 'break', 'by', 'continue', 'ctypedef', 'del', 'elif',
 'else', 'except', 'except?', 'exec', 'finally', 'for', 'fused', 'gil',
 'global', 'if', 'include', 'lambda', 'nogil', 'pass', 'print',
 'raise', 'return', 'try', 'while', 'yield', 'as', 'with'), suffix=r'\b'),
 Keyword),
 (r'(DEF|IF|ELIF|ELSE)\b', Comment.Preproc),

Mercurial Repositories > eric / file comparison

comparison: eric6/ThirdParty/Pygments/pygments/lexers/python.py

eric6/ThirdParty/Pygments/pygments/lexers/python.py