Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update semanal_enum.py #8436

Closed
wants to merge 10 commits into from
Closed

Update semanal_enum.py #8436

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
25b4277
Update semanal_enum.py
Arshaan-256 Feb 24, 2020
44646a5
Relaxed the checks for IntEnum() parameters.
Arshaan-256 Feb 26, 2020
9a0438f
Updated semanal_enum.py
Arshaan-256 Feb 26, 2020
031e5e4
Updated error.
Arshaan-256 Feb 26, 2020
b97e188
Edited semanal_enum.py
Arshaan-256 Mar 3, 2020
d1d5021
Update mypy/checkexpr.py
Arshaan-256 Mar 3, 2020
44f92d9
Removed a debug print statement
Arshaan-256 Mar 3, 2020
5434e24
Completed the test file for IntEnum.
Arshaan-256 Mar 5, 2020
bb7d0c7
Merge branch 'master' of https:/Arshaan-256/mypy
Arshaan-256 Mar 5, 2020
d862244
Removed debugging error.
Arshaan-256 Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mypy/checkexpr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3424,6 +3424,8 @@ def visit_super_expr(self, e: SuperExpr) -> Type:

# We have an expression like super(T, var).member

print(SuperExpr)
Arshaan-256 marked this conversation as resolved.
Show resolved Hide resolved

# First compute the types of T and var
types = self._super_arg_types(e)
if isinstance(types, tuple):
Expand Down
30 changes: 26 additions & 4 deletions mypy/semanal_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from mypy.nodes import (
Expression, Context, TypeInfo, AssignmentStmt, NameExpr, CallExpr, RefExpr, StrExpr,
UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, MDEF, ARG_POS,
UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, MDEF, ARG_POS, ARG_NAMED_OPT,
EnumCallExpr, MemberExpr
)
from mypy.semanal_shared import SemanticAnalyzerInterface
Expand Down Expand Up @@ -106,10 +106,32 @@ def parse_enum_call_args(self, call: CallExpr,
args = call.args
if len(args) < 2:
return self.fail_enum_call_arg("Too few arguments for %s()" % class_name, call)
if len(args) > 2:

elif len(args) == 2:
if call.arg_kinds != [ARG_POS, ARG_POS]:
return self.fail_enum_call_arg("Unexpected arguments to %s()" % class_name, call)

elif len(args) > 2:
if len(args) == 3:
if call.arg_kinds != [ARG_POS, ARG_POS, ARG_NAMED_OPT]:
return self.fail_enum_call_arg("Too many arguments for %s()" % class_name, call)
elif len(args) == 4:
if call.arg_kinds != [ARG_POS, ARG_POS, ARG_NAMED_OPT, ARG_NAMED_OPT]:
return self.fail_enum_call_arg("Too many arguments for %s()" % class_name, call)
elif len(args) == 5:
if call.arg_kinds != [ARG_POS, ARG_POS, ARG_NAMED_OPT, ARG_NAMED_OPT, ARG_NAMED_OPT]:
return self.fail_enum_call_arg("Too many arguments for %s()" % class_name, call)
elif len(args) == 6:
if call.arg_kinds != [ARG_POS, ARG_POS, ARG_NAMED_OPT, ARG_NAMED_OPT, ARG_NAMED_OPT, ARG_NAMED_OPT]:
return self.fail_enum_call_arg("Too many arguments for %s()" % class_name, call)

for arg in args:
if arg not in ['module', 'qualname', 'type', 'start']:
return self.fail_enum_call_arg("Unexpected keyword %s arguments for %s()" % (arg, class_name), call)

else:
return self.fail_enum_call_arg("Too many arguments for %s()" % class_name, call)
if call.arg_kinds != [ARG_POS, ARG_POS]:
return self.fail_enum_call_arg("Unexpected arguments to %s()" % class_name, call)

if not isinstance(args[0], (StrExpr, UnicodeExpr)):
return self.fail_enum_call_arg(
"%s() expects a string literal as the first argument" % class_name, call)
Expand Down