diff options
author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-12 01:05:55 +0000 |
---|---|---|
committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-12 01:05:55 +0000 |
commit | 1b6c815a3fd34f14c20d5cd627155799d1de535c (patch) | |
tree | 911f6ad44b383e1276bb0978cc658b8a2bfa3f50 /dist/api_config.py | |
parent | ca6eee06ffdacc8e191987e64b3791740dad21e1 (diff) | |
parent | 1b812c0aa2fbab91e289642b0a8d02d65c879438 (diff) | |
download | mongodb-3.5.1.tar.gz |
Merge branch 'develop' into mongodb-3.6mongodb-3.5.1
Diffstat (limited to 'dist/api_config.py')
-rw-r--r-- | dist/api_config.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dist/api_config.py b/dist/api_config.py index 1069a7037ce..d83a632321e 100644 --- a/dist/api_config.py +++ b/dist/api_config.py @@ -198,7 +198,8 @@ def get_default(c): return 'false' elif c.default == 'true': return 'true' - elif t == 'string' and c.default == 'none': + elif t == 'string' and c.default == 'none' and \ + not c.flags.get('choices', []): return '' elif t == 'category': return '(%s)' % (','.join('%s=%s' % (subc.name, get_default(subc)) |