httpservlet
diff --git a/‎test/simple_source/bug31/04_def_attr.py‎ ‎…t/simple_source/bug31/04_def_annotate.py‎test/simple_source/bug31/04_def_attr.py renamed to test/simple_source/bug31/04_def_annotate.py b/‎test/simple_source/bug31/04_def_attr.py‎ ‎…t/simple_source/bug31/04_def_annotate.py‎test/simple_source/bug31/04_def_attr.py renamed to test/simple_source/bug31/04_def_annotate.py
diff --git a/‎uncompyle6/parsers/parse31.py‎
Lines changed: 5 additions & 4 deletions b/‎uncompyle6/parsers/parse31.py‎
Lines changed: 5 additions & 4 deletions
@@ -33,8 +33,8 @@ def p_31(self, args):
         load  ::= LOAD_FAST
         load  ::= LOAD_NAME
 
-        stmt ::= funcdeftest
-        funcdeftest ::= mkfunctest designator
+        stmt ::= funcdef_annotate
+        funcdef_annotate ::= mkfunc_annotate designator
         """
 
     def add_custom_rules(self, tokens, customize):
@@ -46,8 +46,9 @@ def add_custom_rules(self, tokens, customize):
                 # Check that there are 2 annotated params?
                 # rule = ('mkfunc2 ::= %s%sEXTENDED_ARG %s' %
                 #         ('pos_arg ' * (args_pos), 'kwargs ' * (annotate_args-1), opname))
-                rule = ('mkfunctest ::= %s%sLOAD_CONST EXTENDED_ARG %s' %
-                        (('pos_arg ' * (args_pos)), 'kwargs ', opname))
+                rule = ('mkfunc_annotate ::= %s%sLOAD_CONST EXTENDED_ARG %s' %
+                        (('pos_arg ' * (args_pos)),
+                         ('kwargs ' * (annotate_args-1)), opname))
                 self.add_unique_rule(rule, opname, token.attr, customize)
 
 class Python31ParserSingle(Python31Parser, PythonParserSingle):