Revision d0c8c01d lib/utils/__init__.py
| b/lib/utils/__init__.py | ||
|---|---|---|
| 57 | 57 |
|
| 58 | 58 |
_VALID_SERVICE_NAME_RE = re.compile("^[-_.a-zA-Z0-9]{1,128}$")
|
| 59 | 59 |
|
| 60 |
UUID_RE = re.compile('^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-'
|
|
| 61 |
'[a-f0-9]{4}-[a-f0-9]{12}$')
|
|
| 60 |
UUID_RE = re.compile("^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-"
|
|
| 61 |
"[a-f0-9]{4}-[a-f0-9]{12}$")
|
|
| 62 | 62 |
|
| 63 | 63 |
|
| 64 | 64 |
def ForceDictType(target, key_types, allowed_values=None): |
| ... | ... | |
| 98 | 98 |
pass |
| 99 | 99 |
elif not isinstance(target[key], basestring): |
| 100 | 100 |
if isinstance(target[key], bool) and not target[key]: |
| 101 |
target[key] = ''
|
|
| 101 |
target[key] = ""
|
|
| 102 | 102 |
else: |
| 103 | 103 |
msg = "'%s' (value %s) is not a valid string" % (key, target[key]) |
| 104 | 104 |
raise errors.TypeEnforcementError(msg) |
| ... | ... | |
| 546 | 546 |
""" |
| 547 | 547 |
def wrap(fn): |
| 548 | 548 |
def sig_function(*args, **kwargs): |
| 549 |
assert 'signal_handlers' not in kwargs or \
|
|
| 550 |
kwargs['signal_handlers'] is None or \
|
|
| 551 |
isinstance(kwargs['signal_handlers'], dict), \
|
|
| 549 |
assert "signal_handlers" not in kwargs or \
|
|
| 550 |
kwargs["signal_handlers"] is None or \
|
|
| 551 |
isinstance(kwargs["signal_handlers"], dict), \
|
|
| 552 | 552 |
"Wrong signal_handlers parameter in original function call" |
| 553 |
if 'signal_handlers' in kwargs and kwargs['signal_handlers'] is not None:
|
|
| 554 |
signal_handlers = kwargs['signal_handlers']
|
|
| 553 |
if "signal_handlers" in kwargs and kwargs["signal_handlers"] is not None:
|
|
| 554 |
signal_handlers = kwargs["signal_handlers"]
|
|
| 555 | 555 |
else: |
| 556 | 556 |
signal_handlers = {}
|
| 557 |
kwargs['signal_handlers'] = signal_handlers
|
|
| 557 |
kwargs["signal_handlers"] = signal_handlers
|
|
| 558 | 558 |
sighandler = SignalHandler(signums) |
| 559 | 559 |
try: |
| 560 | 560 |
for sig in signums: |
Also available in: Unified diff