From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 19 Jan 2012 17:33:42 +0000 (+0100)
Subject: use session.delete(x) rather than del x
X-Git-Tag: before-migrate~17
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=586dca445efd49d3888e171f87fc2d9d9ee49cdb

use session.delete(x) rather than del x
---

diff --git a/sfa/importer/sfa-import-openstack.py b/sfa/importer/sfa-import-openstack.py
index 9794ec71..ae3d8975 100755
--- a/sfa/importer/sfa-import-openstack.py
+++ b/sfa/importer/sfa-import-openstack.py
@@ -155,7 +155,7 @@ def main():
         
         record_object = existing_records[ (record_hrn, type) ]
         logger.info("Import: removing %s " % record.summary_string())
-        del record_object
+        dbsession.delete(record_object)
         dbsession.commit()
                                    
     # save pub keys
diff --git a/sfa/importer/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py
index 768473f3..9076237b 100755
--- a/sfa/importer/sfa-import-plc.py
+++ b/sfa/importer/sfa-import-plc.py
@@ -343,7 +343,7 @@ def main():
             try:
                 record_object = existing_records[(record_hrn, type)]
                 logger.info("Import: deleting record: %s" % record)
-                del record_object
+                dbsession.delete(record_object)
                 dbsession.commit()
             except:
                 logger.log_exc("Import: failded to delete record")                    
diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py
index 218d62b5..e40772d0 100644
--- a/sfa/managers/registry_manager.py
+++ b/sfa/managers/registry_manager.py
@@ -385,7 +385,7 @@ class RegistryManager:
             logger.warning("driver.remove failed")
 
         # delete from sfa db
-        del record
+        dbsession.delete(record)
         dbsession.commit()
     
         return 1
diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 1f222155..8355d1cb 100755
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -144,7 +144,7 @@ def update_cert_records(gids):
     for record in records_found:
         if record.hrn not in hrns_expected and \
             record.hrn != self.api.config.SFA_INTERFACE_HRN:
-            del record
+            dbsession.delete(record)
 
     # TODO: store urn in the db so we do this in 1 query 
     for gid in gids:
diff --git a/sfa/storage/alchemy.py b/sfa/storage/alchemy.py
index e83a0f1e..ead5219d 100644
--- a/sfa/storage/alchemy.py
+++ b/sfa/storage/alchemy.py
@@ -73,7 +73,7 @@ class Alchemy:
         self.commit()
 
     def remove (self, record):
-        del record
+        self.delete(record)
         self.commit()
 
 ####################