X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=UDLdap.py;fp=UDLdap.py;h=6494c0deb5a53cf243a640407a35fa4d2ed4b828;hp=4f83137f1e892468ba27fa3abf2a94589f41b565;hb=8ed623dc42c5bdfa073c068479f06c14c49d8a9c;hpb=9c3400fed701494b24575a602d25a83ae1815b72

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: