diff options
| -rw-r--r-- | ipalib/plugins/stageuser.py | 4 | ||||
| -rw-r--r-- | ipapython/config.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py index 510b66c43..9b40adf1c 100644 --- a/ipalib/plugins/stageuser.py +++ b/ipalib/plugins/stageuser.py @@ -565,7 +565,7 @@ class stageuser_activate(LDAPQuery): try: v.decode('utf-8') self.log.debug("merge: %s:%r wiped" % (attr, v)) - except ValueError: + except Exception: self.log.debug("merge %s: [no_print %s]" % (attr, v.__class__.__name__)) if isinstance(entry_to[attr], (list, tuple)): # multi value attribute @@ -581,7 +581,7 @@ class stageuser_activate(LDAPQuery): try: v.decode('utf-8') self.log.debug("Add: %s:%r" % (attr, v)) - except ValueError: + except Exception: self.log.debug("Add %s: [no_print %s]" % (attr, v.__class__.__name__)) if isinstance(entry_to[attr], (list, tuple)): diff --git a/ipapython/config.py b/ipapython/config.py index 0b70d0579..70afaffa2 100644 --- a/ipapython/config.py +++ b/ipapython/config.py @@ -160,7 +160,7 @@ def __parse_config(discover_server = True): try: if not config.default_realm: config.default_realm = p.get("global", "realm") - except AttributeError: + except Exception: pass if discover_server: try: @@ -172,7 +172,7 @@ def __parse_config(discover_server = True): try: if not config.default_domain: config.default_domain = p.get("global", "domain") - except AttributeError: + except Exception: pass def __discover_config(discover_server = True): |