summaryrefslogtreecommitdiff
path: root/oslo_config/generator.py
diff options
context:
space:
mode:
authorMasaki Matsushita <glass.saga@gmail.com>2015-09-28 20:28:28 +0900
committerMasaki Matsushita <glass.saga@gmail.com>2016-06-17 13:39:39 +0900
commit45ee2bed52a57b9801435b43ad45d8f50204580d (patch)
tree322a2712dc645c62b3be78149b23d332aa78bfa9 /oslo_config/generator.py
parentbb0f7e3880bd83dbb9088f3f8045152ce8e7897b (diff)
downloadoslo-config-45ee2bed52a57b9801435b43ad45d8f50204580d.tar.gz
Add URIOpt
This change add URIOpt which validates string as URI. Closes-Bug: #1500398 Change-Id: Ie8736b8654b9feb2a2b174159f08dbea03568d84
Diffstat (limited to 'oslo_config/generator.py')
-rw-r--r--oslo_config/generator.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/oslo_config/generator.py b/oslo_config/generator.py
index 64a27de..087b6d5 100644
--- a/oslo_config/generator.py
+++ b/oslo_config/generator.py
@@ -77,9 +77,8 @@ def _format_defaults(opt):
default_str = str(opt.sample_default)
elif opt.default is None:
default_str = '<None>'
- elif (isinstance(opt, cfg.StrOpt) or
- isinstance(opt, cfg.IPOpt) or
- isinstance(opt, cfg.HostnameOpt)):
+ elif (isinstance(opt, (cfg.StrOpt, cfg.IPOpt,
+ cfg.HostnameOpt, cfg.URIOpt))):
default_str = opt.default
elif isinstance(opt, cfg.BoolOpt):
default_str = str(opt.default).lower()