Fix: catch Exception instead of more specific exception types

Regression caused by commit 491447cc5a,
ValueErrori and AttributeError are too much specific for these cases, multiple types of
exception can be raised.

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>

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)):

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):