trimmed useless imports, unstarred all imports

[sfa.git] / sfa / util / table.py

diff --git a/sfa/util/table.py b/sfa/util/table.py
index 44d0b86..065e8ab 100644 (file)
--- a/sfa/util/table.py
+++ b/sfa/util/table.py
@@ -1,17 +1,15 @@
-### $Id$
-### $URL$
 #
 # implements support for SFA records stored in db tables
 #
 # TODO: Use existing PLC database methods? or keep this separate?
 
-import pgdb
+from types import StringTypes
 
-from sfa.util.PostgreSQL import *
-from sfa.trust.gid import *
-from sfa.util.record import *
-from sfa.util.config import *
-from sfa.util.filter import *
+from sfa.util.config import Config
+from sfa.util.parameter import Parameter
+from sfa.util.filter import Filter
+from sfa.util.PostgreSQL import PostgreSQL
+from sfa.util.record import SfaRecord, AuthorityRecord, NodeRecord, SliceRecord, UserRecord
 
 class SfaTable(list):
 
@@ -39,7 +37,7 @@ class SfaTable(list):
     def db_fields(self, obj=None):
         
         db_fields = self.db.fields(self.SFA_TABLE_PREFIX)
-        return dict( [ (key,value) for (key, value) in obj.items() \
+        return dict( [ (key,value) for (key, value) in obj.iteritems() \
                         if key in db_fields and
                         self.is_writable(key, value, SfaRecord.fields)] )      
 
@@ -102,7 +100,7 @@ class SfaTable(list):
     def insert(self, record):
         db_fields = self.db_fields(record)
         keys = db_fields.keys()
-        values = [self.db.param(key, value) for (key, value) in db_fields.items()]
+        values = [self.db.param(key, value) for (key, value) in db_fields.iteritems()]
         query_str = "INSERT INTO " + self.tablename + \
                        "(" + ",".join(keys) + ") " + \
                        "VALUES(" + ",".join(values) + ")"
@@ -121,7 +119,7 @@ class SfaTable(list):
     def update(self, record):
         db_fields = self.db_fields(record)
         keys = db_fields.keys()
-        values = [self.db.param(key, value) for (key, value) in db_fields.items()]
+        values = [self.db.param(key, value) for (key, value) in db_fields.iteritems()]
         columns = ["%s = %s" % (key, value) for (key, value) in zip(keys, values)]
         query_str = "UPDATE %s SET %s WHERE record_id = %s" % \
                     (self.tablename, ", ".join(columns), record['record_id'])