merge of '53ba3739a8b7ce64040a91695b40bad1a7d7e1aa'

and '9c35c13adaec0c9fe67e19acb1c73a22271aa714'

Monotone-Parent: 53ba3739a8b7ce64040a91695b40bad1a7d7e1aa
Monotone-Parent: 9c35c13adaec0c9fe67e19acb1c73a22271aa714
Monotone-Revision: 3d26091bec393e3abf8d2b6033e0737e09c207b9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-22T14:46:24
Monotone-Branch: ca.inverse.sogo

Tests/Integration/preferences.py

@@ -72,11 +72,11 @@ class preferences:
   def set(self, preference, value=None):
     # if preference is a dict, set all prefs found in the dict
     content=""
-    try:
+    if isinstance(preference, dict):
       for k,v in preference.items():
         content+="%s=%s&" % (self.preferencesMap[k], v)
-    except AttributeError:
-      # preference wasn't a dict
+    else:
+      # assume it is a str
       formKey = self.preferencesMap[preference]
       content = "%s=%s&hasChanged=1" % (formKey, value)