Merge pull request #88 from CloudBotIRC/master

merge patch from master to python3.4

Author: dmptrluke

cloudbot/permissions.py

@@ -75,15 +75,17 @@ def has_perm_mask(self, user_mask, perm, notice=True):
             if fnmatch(user_mask.lower(), backdoor.lower()):
                 return True
 
-        perm = perm.lower()
-
-        for user_perm, allowed_users in self.perm_users.items():
-            if fnmatch(perm, user_perm):
-                for allowed_mask in allowed_users:
-                    if fnmatch(allowed_mask, user_mask.lower()):
-                        if notice:
-                            logger.info("[{}|permissions] Allowed user {} access to {}".format(self.name, user_mask, perm))
-                        return True
+        if not perm.lower() in self.perm_users:
+            # no one has access
+            return False
+
+        allowed_users = self.perm_users[perm.lower()]
+
+        for allowed_mask in allowed_users:
+            if fnmatch(user_mask.lower(), allowed_mask):
+                if notice:
+                    logger.info("[{}|permissions] Allowed user {} access to {}".format(self.name, user_mask, perm))
+                return True
 
         return False