blind 2to3

[plcapi.git] / PLC / Roles.py

diff --git a/PLC/Roles.py b/PLC/Roles.py
index 03d9884..283b386 100644 (file)
--- a/PLC/Roles.py
+++ b/PLC/Roles.py
@@ -4,9 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 from types import StringTypes
 from PLC.Faults import *
@@ -22,7 +19,7 @@ class Role(Row):
 
     table_name = 'roles'
     primary_key = 'role_id'
-    join_tables = ['person_role', ('tag_types', 'min_role_id')]
+    join_tables = ['person_role', 'tag_type_role' ]
     fields = {
         'role_id': Parameter(int, "Role identifier"),
         'name': Parameter(str, "Role", max = 100),
@@ -32,19 +29,19 @@ class Role(Row):
         # Make sure role does not already exist
         conflicts = Roles(self.api, [role_id])
         if conflicts:
-            raise PLCInvalidArgument, "Role ID already in use"
+            raise PLCInvalidArgument("Role ID already in use")
 
         return role_id
 
     def validate_name(self, name):
         # Make sure name is not blank
         if not len(name):
-            raise PLCInvalidArgument, "Role must be specified"
+            raise PLCInvalidArgument("Role must be specified")
 
         # Make sure role does not already exist
         conflicts = Roles(self.api, [name])
         if conflicts:
-            raise PLCInvalidArgument, "Role name already in use"
+            raise PLCInvalidArgument("Role name already in use")
 
         return name
 
@@ -62,20 +59,20 @@ class Roles(Table):
         if role_filter is not None:
             if isinstance(role_filter, (list, tuple, set)):
                 # Separate the list into integers and strings
-                ints = filter(lambda x: isinstance(x, (int, long)), role_filter)
-                strs = filter(lambda x: isinstance(x, StringTypes), role_filter)
+                ints = [x for x in role_filter if isinstance(x, int)]
+                strs = [x for x in role_filter if isinstance(x, StringTypes)]
                 role_filter = Filter(Role.fields, {'role_id': ints, 'name': strs})
                 sql += " AND (%s) %s" % role_filter.sql(api, "OR")
             elif isinstance(role_filter, dict):
                 role_filter = Filter(Role.fields, role_filter)
                 sql += " AND (%s) %s" % role_filter.sql(api, "AND")
-            elif isinstance(role_filter, (int, long)):
+            elif isinstance(role_filter, int):
                 role_filter = Filter(Role.fields, {'role_id': role_filter})
                 sql += " AND (%s) %s" % role_filter.sql(api, "AND")
             elif isinstance(role_filter, StringTypes):
                 role_filter = Filter(Role.fields, {'name': role_filter})
                 sql += " AND (%s) %s" % role_filter.sql(api, "AND")
             else:
-                raise PLCInvalidArgument, "Wrong role filter %r"%role_filter
+                raise PLCInvalidArgument("Wrong role filter %r"%role_filter)
 
         self.selectall(sql)