Avoid all(), as it's not available in Python 2.4.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 27 May 2012 12:17:52 +0000 (14:17 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 27 May 2012 14:13:34 +0000 (16:13 +0200)
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun May 27 16:13:34 CEST 2012 on sn-devel-104

source4/scripting/python/samba/__init__.py

index 6ffd2a308cc686771ff31e28f43a1bbde2623090..23c6ed77d74f6203294ba925eeff8ebe49283616 100644 (file)
@@ -302,12 +302,16 @@ MAX_NETBIOS_NAME_LEN = 15
 def is_valid_netbios_char(c):
     return (c.isalnum() or c in " !#$%&'()-.@^_{}~")
 
+
 def valid_netbios_name(name):
     """Check whether a name is valid as a NetBIOS name. """
     # See crh's book (1.4.1.1)
     if len(name) > MAX_NETBIOS_NAME_LEN:
         return False
-    return all([is_valid_netbios_char(x) for x in name])
+    for x in name:
+        if not is_valid_netbios_char(x):
+            return False
+    return True
 
 
 def import_bundled_package(modulename, location):