check if permissive is in global properties before allow permissive for an option
This commit is contained in:
@@ -243,5 +243,4 @@ def calculate(callback, args, kwargs):
|
||||
:param kwargs: in the callback's arity, the named parameters
|
||||
|
||||
"""
|
||||
print args, kwargs, callback(*args, **kwargs)
|
||||
return callback(*args, **kwargs)
|
||||
|
@@ -406,10 +406,11 @@ class Settings(object):
|
||||
"""
|
||||
# opt properties
|
||||
properties = copy(self._getproperties(opt_or_descr, path))
|
||||
# remove opt permissive
|
||||
properties -= self._p_.getpermissive(path)
|
||||
# remove global permissive if need
|
||||
self_properties = copy(self._getproperties())
|
||||
# remove opt permissive
|
||||
if force_permissive is True or 'permissive' in self_properties:
|
||||
properties -= self._p_.getpermissive(path)
|
||||
# remove global permissive if need
|
||||
if force_permissive is True or 'permissive' in self_properties:
|
||||
properties -= self._p_.getpermissive()
|
||||
if force_permissives is not None:
|
||||
|
Reference in New Issue
Block a user