[dataimport] dict.iteritems() → dict.items()
authorJulien Cristau <julien.cristau@logilab.fr>
Wed, 21 Oct 2015 20:17:44 +0200
changeset 10856 b839167d99a4
parent 10855 cd91f46fa633
child 10857 aa490912d9da
[dataimport] dict.iteritems() → dict.items()
dataimport/massive_store.py
--- a/dataimport/massive_store.py	Wed Oct 21 20:16:41 2015 +0200
+++ b/dataimport/massive_store.py	Wed Oct 21 20:17:44 2015 +0200
@@ -226,7 +226,7 @@
     def flush_relations(self):
         """ Flush the relations data
         """
-        for rtype, data in self._data_uri_relations.iteritems():
+        for rtype, data in self._data_uri_relations.items():
             if not data:
                 self.logger.info('No data for rtype %s', rtype)
             buf = StringIO('\n'.join(['%(uri_from)s\t%(uri_to)s' % d for d in data]))
@@ -317,12 +317,12 @@
     def _drop_table_constraints_indexes(self, tablename):
         """ Drop and store table constraints and indexes """
         indexes, constraints = self._dbh.application_indexes_constraints(tablename)
-        for name, query in constraints.iteritems():
+        for name, query in constraints.items():
             sql = 'INSERT INTO dataio_constraints VALUES (%(e)s, %(c)s, %(t)s)'
             self.sql(sql, {'e': tablename, 'c': query, 't': 'constraint'})
             sql = 'ALTER TABLE %s DROP CONSTRAINT %s CASCADE' % (tablename, name)
             self.sql(sql)
-        for name, query in indexes.iteritems():
+        for name, query in indexes.items():
             sql = 'INSERT INTO dataio_constraints VALUES (%(e)s, %(c)s, %(t)s)'
             self.sql(sql, {'e': tablename, 'c': query, 't': 'index'})
             sql = 'DROP INDEX %s' % name
@@ -504,7 +504,7 @@
     def flush_internal_relations(self):
         """ Flush the relations data
         """
-        for rtype, data in self._data_relations.iteritems():
+        for rtype, data in self._data_relations.items():
             if not data:
                 # There is no data for these etype for this flush round.
                 continue
@@ -526,7 +526,7 @@
     def flush_entities(self):
         """ Flush the entities data
         """
-        for etype, data in self._data_entities.iteritems():
+        for etype, data in self._data_entities.items():
             if not data:
                 # There is no data for these etype for this flush round.
                 continue
@@ -736,7 +736,7 @@
         indexes = self.application_indexes(tablename)
         constraints = self.application_constraints(tablename)
         _indexes = {}
-        for name, query in indexes.iteritems():
+        for name, query in indexes.items():
             # Remove pkey indexes (automatically created by constraints)
             # Specific cases of primary key, see #3224079
             if name not in constraints: