Skip to content

Fixes #96 dvp init hitting TypeError on Windows10 #99

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

Merged
muralinimmagadda merged 3 commits into from
Apr 24, 2020
Merged

Fixes #96 dvp init hitting TypeError on Windows10 #99

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c9e070
Fixes #96 dvp init hitting TypeError on Windows10
muralinimmagadda Apr 21, 2020
e1d6ce4
Update cli.py
muralinimmagadda Apr 21, 2020
20a5925
Update cli.py
muralinimmagadda Apr 22, 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
18 changes: 17 additions & 1 deletion tools/src/main/python/dlpx/virtualization/_internal/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@
# This is needed to add -h as an option for the help menu.
CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'],
obj=click_util.ConfigFileProcessor.read_config())
#
# This setting is added to workaround the bug in click 7.1 on windows
# when case_sensitive=False is used on click.Options. Line 187 of click
# code at https://github.com/pallets/click/blob/7.x/src/click/types.py
# fails when lower() method is called on normed_value as unicode type is
# received on windows instead of string type. Removing case_sensitive=False
# is not a good workaround as the behaviour of command changes.

# This workaround uses token_normalize_func to convert normed_value
# into an ascii string so that when lower() is called on it, it wont fail.
# Also, chose to separate out this into a different settings instead of
# adding it to CONTEXT_SETTINGS to avoid any side-effects on other commands.
#
CONTEXT_SETTINGS_INIT = dict(help_option_names=['-h', '--help'],
obj=click_util.ConfigFileProcessor.read_config(),
token_normalize_func=lambda x: x.encode("ascii"))

DVP_CONFIG_MAP = CONTEXT_SETTINGS['obj']

Expand Down Expand Up @@ -87,7 +103,7 @@ def delphix_sdk(verbose, quiet):
'Supported version is 2.7.x, found {}'.format(sys.version_info))


@delphix_sdk.command()
@delphix_sdk.command(context_settings=CONTEXT_SETTINGS_INIT)
@click.option('-r',
'--root-dir',
'root',
Expand Down