# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1299153329 -3600
# Node ID ddc1b4d80dbd7d0ebb9a27e6d0fbf845b4ea32c9
# Parent  b712477ae28692f4849f1887fd6d00a12ef1d4f2
[dataimport] remove eid_key deprecation warning and prints

diff -r b712477ae286 -r ddc1b4d80dbd dataimport.py
--- a/dataimport.py	Mon Feb 28 14:14:19 2011 +0100
+++ b/dataimport.py	Thu Mar 03 12:55:29 2011 +0100
@@ -339,6 +339,7 @@
     def rql(self, *args):
         if self._rql is not None:
             return self._rql(*args)
+        return []
 
     @property
     def nb_inserted_entities(self):
@@ -470,7 +471,7 @@
         eid_from, rtype, eid_to = super(RQLObjectStore, self).relate(
             eid_from, rtype, eid_to)
         self.rql('SET X %s Y WHERE X eid %%(x)s, Y eid %%(y)s' % rtype,
-                  {'x': int(eid_from), 'y': int(eid_to)}, ('x', 'y'))
+                 {'x': int(eid_from), 'y': int(eid_to)})
 
 
 # the import controller ########################################################
@@ -513,7 +514,6 @@
             traceback.print_exc(file=tmp)
         else:
             traceback.print_exception(type, value, tb, file=tmp)
-        print tmp.getvalue()
         # use a list to avoid counting a <nb lines> errors instead of one
         errorlog = self.errors.setdefault(key, [])
         if msg is None: