Setting tag plcapi-5.4-2

[plcapi.git] / PLC / NodeTypes.py

diff --git a/PLC/NodeTypes.py b/PLC/NodeTypes.py
index e3db781..00d4bf7 100644 (file)
--- a/PLC/NodeTypes.py
+++ b/PLC/NodeTypes.py
@@ -1,7 +1,6 @@
 #
 # Functions for interacting with the node_types table in the database
 #
-# $Id$
 #
 
 from PLC.Faults import *
@@ -22,16 +21,16 @@ class NodeType(Row):
         }
 
     def validate_node_type(self, name):
-       # Make sure name is not blank
+        # Make sure name is not blank
         if not len(name):
             raise PLCInvalidArgument, "Node type must be specified"
-       
-       # Make sure node type does not alredy exist
-       conflicts = NodeTypes(self.api, [name])
+
+        # Make sure node type does not alredy exist
+        conflicts = NodeTypes(self.api, [name])
         if conflicts:
             raise PLCInvalidArgument, "Node type name already in use"
 
-       return name
+        return name
 
 class NodeTypes(Table):
     """
@@ -43,8 +42,8 @@ class NodeTypes(Table):
 
         sql = "SELECT %s FROM node_types" % \
               ", ".join(NodeType.fields)
-        
+
         if node_types:
-            sql += " WHERE node_type IN (%s)" % ", ".join(map(api.db.quote, node_types))
+            sql += " WHERE node_type IN (%s)" % ", ".join( [ api.db.quote (t) for t in node_types ] )
 
         self.selectall(sql)