# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1404913918 -7200
# Node ID b2919eca751458d9c9954b38abd309b5162f9e3f
# Parent  1fa35cc06c69907c5d8fed95f98d9058b48a9e04
[dataimport] remove _rql heresy

1) ObjectStore knows nothing about rql, it just drops it on the floor
2) RQLObjectStore has a session, it can run rql that way
3) setting an object's "_rql" attribute is not a reasonable user-facing
   interface

Also drop _commit attribute from base ObjectStore, it doesn't use it.

diff -r 1fa35cc06c69 -r b2919eca7514 dataimport.py
--- a/dataimport.py	Wed Jul 09 15:40:50 2014 +0200
+++ b/dataimport.py	Wed Jul 09 15:51:58 2014 +0200
@@ -49,12 +49,7 @@
   GENERATORS.append( (gen_users, CHK) )
 
   # create controller
-  if 'cnx' in globals():
-      ctl = CWImportController(RQLObjectStore(cnx))
-  else:
-      print 'debug mode (not connected)'
-      print 'run through cubicweb-ctl shell to access an instance'
-      ctl = CWImportController(ObjectStore())
+  ctl = CWImportController(RQLObjectStore(cnx))
   ctl.askerror = 1
   ctl.generators = GENERATORS
   ctl.data['utilisateurs'] = lazytable(ucsvreader(open('users.csv')))
@@ -553,8 +548,6 @@
         self.types = {}
         self.relations = set()
         self.indexes = {}
-        self._rql = None
-        self._commit = None
 
     def create_entity(self, etype, **data):
         data = attrdict(data)
@@ -600,11 +593,6 @@
         else:
             print 'flush done'
 
-    def rql(self, *args):
-        if self._rql is not None:
-            return self._rql(*args)
-        return []
-
     @property
     def nb_inserted_entities(self):
         return len(self.eids)
@@ -617,7 +605,6 @@
 
 class RQLObjectStore(ObjectStore):
     """ObjectStore that works with an actual RQL repository (production mode)"""
-    _rql = None # bw compat
 
     def __init__(self, session, commit=None):
         ObjectStore.__init__(self)
@@ -641,8 +628,6 @@
         return txuuid
 
     def rql(self, *args):
-        if self._rql is not None:
-            return self._rql(*args)
         return self.session.execute(*args)
 
     def create_entity(self, *args, **kwargs):
@@ -790,7 +775,6 @@
 
 class NoHookRQLObjectStore(RQLObjectStore):
     """ObjectStore that works with an actual RQL repository (production mode)"""
-    _rql = None # bw compat
 
     def __init__(self, session, metagen=None, baseurl=None):
         super(NoHookRQLObjectStore, self).__init__(session)
@@ -803,7 +787,6 @@
         self._nb_inserted_entities = 0
         self._nb_inserted_types = 0
         self._nb_inserted_relations = 0
-        self.rql = session.execute
         # deactivate security
         session.read_security = False
         session.write_security = False