From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 2 Aug 2010 21:28:31 +0000 (+0000)
Subject: fix not-array-value-but-multiple-values check
X-Git-Tag: userdir-ldap-0.3.78~6^2~8
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=8ed623dc42c5bdfa073c068479f06c14c49d8a9c

fix not-array-value-but-multiple-values check
---

diff --git a/UDLdap.py b/UDLdap.py
index 4f83137..6494c0d 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -30,11 +30,12 @@ class Account:
         if key in self.attributes:
             if key in self.array_values:
                 return self.attributes[key]
-            elif key in self.int_values:
-                if len(self.attributes[key]) == 1:
-                    return int(self.attributes[key][0])
-                else:
-                    raise ValueError, 'non-array value has not exactly one value'
+
+            if not len(self.attributes[key]) == 1:
+                raise ValueError, 'non-array value has not exactly one value'
+
+            if key in self.int_values:
+                return int(self.attributes[key][0])
             else:
                 return self.attributes[key][0]
         elif key in self.defaults: