async/await are now always keywords

pycodestyle no longer supports python 3.6

Author: asottile

docs/intro.rst

@@ -413,8 +413,6 @@ This is the current list of error and warning codes:
 +------------+----------------------------------------------------------------------+
 | W605       | invalid escape sequence '\x'                                         |
 +------------+----------------------------------------------------------------------+
-| W606       | 'async' and 'await' are reserved keywords starting with Python 3.7   |
-+------------+----------------------------------------------------------------------+
 
 
 **(*)** In the default configuration, the checks **E121**, **E123**, **E126**, **E133**,

pycodestyle.py

@@ -102,7 +102,7 @@
 
 PyCF_ONLY_AST = 1024
 SINGLETONS = frozenset(['False', 'None', 'True'])
-KEYWORDS = frozenset(keyword.kwlist + ['print', 'async']) - SINGLETONS
+KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS
 UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-'])
 ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-', '@'])
 WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%'])
@@ -493,7 +493,6 @@ def missing_whitespace_after_keyword(logical_line, tokens):
         if (tok0.end == tok1.start and
                 keyword.iskeyword(tok0.string) and
                 tok0.string not in SINGLETONS and
-                tok0.string not in ('async', 'await') and
                 not (tok0.string == 'except' and tok1.string == '*') and
                 not (tok0.string == 'yield' and tok1.string == ')') and
                 tok1.string not in ':\n'):
@@ -1645,76 +1644,6 @@ def python_3000_invalid_escape_sequence(logical_line, tokens, noqa):
                     pos = string.find('\\', pos + 1)
 
 
-@register_check
-def python_3000_async_await_keywords(logical_line, tokens):
-    """'async' and 'await' are reserved keywords starting at Python 3.7.
-
-    W606: async = 42
-    W606: await = 42
-    Okay: async def read(db):\n    data = await db.fetch('SELECT ...')
-    """
-    # The Python tokenize library before Python 3.5 recognizes
-    # async/await as a NAME token. Therefore, use a state machine to
-    # look for the possible async/await constructs as defined by the
-    # Python grammar:
-    # https://docs.python.org/3/reference/grammar.html
-
-    state = None
-    for token_type, text, start, end, line in tokens:
-        error = False
-
-        if token_type == tokenize.NL:
-            continue
-
-        if state is None:
-            if token_type == tokenize.NAME:
-                if text == 'async':
-                    state = ('async_stmt', start)
-                elif text == 'await':
-                    state = ('await', start)
-                elif (token_type == tokenize.NAME and
-                      text in ('def', 'for')):
-                    state = ('define', start)
-
-        elif state[0] == 'async_stmt':
-            if token_type == tokenize.NAME and text in ('def', 'with', 'for'):
-                # One of funcdef, with_stmt, or for_stmt. Return to
-                # looking for async/await names.
-                state = None
-            else:
-                error = True
-        elif state[0] == 'await':
-            if token_type == tokenize.NAME:
-                # An await expression. Return to looking for async/await
-                # names.
-                state = None
-            elif token_type == tokenize.OP and text == '(':
-                state = None
-            else:
-                error = True
-        elif state[0] == 'define':
-            if token_type == tokenize.NAME and text in ('async', 'await'):
-                error = True
-            else:
-                state = None
-
-        if error:
-            yield (
-                state[1],
-                "W606 'async' and 'await' are reserved keywords starting with "
-                "Python 3.7",
-            )
-            state = None
-
-    # Last token
-    if state is not None:
-        yield (
-            state[1],
-            "W606 'async' and 'await' are reserved keywords starting with "
-            "Python 3.7",
-        )
-
-
 ########################################################################
 @register_check
 def maximum_doc_length(logical_line, max_doc_length, noqa, tokens):

testsuite/W60.py

@@ -29,55 +29,3 @@
 regex = '''
 \w
 '''  # noqa
-#: W606
-async = 42
-#: W606
-await = 42
-#: W606
-await 42
-#: W606
-await 'test'
-#: W606
-def async():
-    pass
-#: W606
-def await():
-    pass
-#: W606
-class async:
-    pass
-#: W606
-class await:
-    pass
-#: Okay
-async def read_data(db):
-    data = await db.fetch('SELECT ...')
-#: Okay
-if await fut:
-    pass
-if (await fut):
-    pass
-if await fut + 1:
-    pass
-if (await fut) + 1:
-    pass
-pair = await fut, 'spam'
-pair = (await fut), 'spam'
-with await fut, open():
-    pass
-with (await fut), open():
-    pass
-await foo()['spam'].baz()()
-return await coro()
-return (await coro())
-res = await coro() ** 2
-res = (await coro()) ** 2
-func(a1=await coro(), a2=0)
-func(a1=(await coro()), a2=0)
-await foo() + await bar()
-(await foo()) + (await bar())
--await foo()
--(await foo())
-(await
- foo())
-await(await foo())