Skip to content

try to refine type #38

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

try to refine type #38

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f082537
try to refine type
bernt-matthias Aug 28, 2020
747eebd
use isinstance instead of issubclass
bernt-matthias Aug 28, 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
24 changes: 15 additions & 9 deletions acclimatise/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,21 @@ def _name_from_arg(self) -> typing.Iterable[str]:

def get_type(self) -> cli_types.CliType:
# Try the argument name, then the flag name, then the description in that order
arg_type = self.args.get_type()
if arg_type is not None:
return arg_type

flag_type = infer_type(self.full_name())
if flag_type is not None:
return flag_type

return infer_type(self.description) or cli_types.CliString()
tpe = None
tpe_cand = [
Copy link
Collaborator

@multimeric multimeric Aug 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer descriptive variable names where possible. typ and type_candidates please.

Copy link
Contributor Author

@bernt-matthias bernt-matthias Aug 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have though your example in #37 would predict None, then CliFile() then CliFile() respectively, and then return CliFile(). We only use subclasses for CliFileSystemType, and only recently, but the inference will never return CliFileSystemType, so it seems irrelevant.

True. I already forgot that we implemented the distinction between in/output files/dirs by properties and not subclasses.Then I will check for isinstance.

Copy link
Collaborator

@multimeric multimeric Aug 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that makes more sense

self.args.get_type(),
infer_type(self.full_name()),
infer_type(self.description),
cli_types.CliString()
]
for c in tpe_cand:
if tpe is None:
if c is not None:
tpe = c
else:
if issubclass(c, tpe):
tpe = c
return tpe

def full_name(self) -> str:
"""
Expand Down