From e05630909e7ec6b2a6f2d4537853da200e9ba6a4 Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Tue, 21 Feb 2012 21:07:35 +0000 Subject: [PATCH] use isinstance instead of try/except to check if preference is a dict or a string. Monotone-Parent: 64241052c164949118642194441e9a30cbdc3d58 Monotone-Revision: 9c35c13adaec0c9fe67e19acb1c73a22271aa714 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-02-21T21:07:35 Monotone-Branch: ca.inverse.sogo --- Tests/Integration/preferences.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Integration/preferences.py b/Tests/Integration/preferences.py index f0bc514f6..626d2e209 100644 --- a/Tests/Integration/preferences.py +++ b/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)