# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1337070962 -7200
# Node ID a6ee3cd783e1e5a13f9e107569ad4327fd32ad79
# Parent  efafa1261477bfc914f7f9154971b1921b5b67e0
[data import] allow a request to be given as argument, ease use from web ui

diff -r efafa1261477 -r a6ee3cd783e1 dataimport.py
--- a/dataimport.py	Tue May 15 10:34:34 2012 +0200
+++ b/dataimport.py	Tue May 15 10:36:02 2012 +0200
@@ -446,9 +446,12 @@
         if session is None:
             sys.exit('please provide a session of run this script with cubicweb-ctl shell and pass cnx as session')
         if not hasattr(session, 'set_cnxset'):
-            # connection
-            cnx = session
-            session = session.request()
+            if hasattr(session, 'request'):
+                # connection object
+                cnx = session
+                session = session.request()
+            else: # object is already a request
+                cnx = session.cnx
             session.set_cnxset = lambda : None
             commit = commit or cnx.commit
         else: