merge from val_prop_plugin branch
authorEmmanuel Garette <egarette@cadoles.com>
Tue, 20 Aug 2013 14:45:54 +0000 (16:45 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Tue, 20 Aug 2013 14:45:54 +0000 (16:45 +0200)
tiramisu/setting.py

index a341d7a..838cc01 100644 (file)
@@ -286,7 +286,7 @@ class Settings(object):
         properties -= self._p_.getpermissive(self._getkey(opt_or_descr))
         #remove global permissive if need
         self_properties = copy(self._getproperties())
-            if force_permissive is True or 'permissive' in self_properties:
+        if force_permissive is True or 'permissive' in self_properties:
             properties -= self._p_.getpermissive()
 
         # global properties