Skip to content

Refactor args.config processing #103

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
merged 3 commits into from
Sep 1, 2019
+14 −6
Merged

Refactor args.config processing #103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44039be
Refactor args.config processing
dhimmel Aug 29, 2019
78d3152
Update RuntimeError message
dhimmel Aug 30, 2019
809e42f
update
kernc Sep 1, 2019
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
20 changes: 14 additions & 6 deletions pdoc/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"""pdoc's CLI interface and helper functions."""

import argparse
import ast
import importlib
import inspect
import os
Expand Down Expand Up @@ -370,12 +371,19 @@ def main(_args=None):
_warn_deprecated('--overwrite', '--force')
args.force = args.overwrite

try:
template_config = {opt.split('=', 1)[0]: eval(opt.split('=', 1)[1], {})
for opt in args.config}
except Exception as e:
raise RuntimeError('Error evaluating config values {}: {}\n'
'Make sure string values are quoted?'.format(args.config, e))
template_config = {}
for config_str in args.config:
try:
key, value = config_str.split('=', 1)
value = ast.literal_eval(value)
template_config[key] = value
except Exception:
raise ValueError(
'Error evaluating --config statement "{}". '
'Make sure string values are quoted?'
.format(config_str)
)
Copy link
Contributor Author

@dhimmel dhimmel Aug 29, 2019

Choose a reason for hiding this comment

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

Switches error message to being for the single bad config option to hopefully be more specific.


if args.html_no_source:
_warn_deprecated('--html-no-source', '-c show_source_code=False', True)
template_config['show_source_code'] = False
Expand Down