cubicweb: comparison web/request.py

equal deleted inserted replaced

-:4f4369e63f5e
+:6abd6e3599f4
 if varmaker is None:
 varmaker = rqlvar_maker()
 self.set_page_data('rql_varmaker', varmaker)
 return varmaker
-def set_connection(self, cnx, user=None):
+def set_session(self, session, user=None):
 """method called by the session handler when the user is authenticated
 or an anonymous connection is open
 """
-super(CubicWebRequestBase, self).set_connection(cnx, user)
+super(CubicWebRequestBase, self).set_session(session, user)
 # set request language
 vreg = self.vreg
 if self.user:
 try:
 # 1. user specified language
 def set_language(self, lang):
 gettext, self.pgettext = self.translations[lang]
 self._ = self.__ = gettext
 self.lang = lang
-self.cnx.set_session_props(lang=lang)
 self.debug('request language: %s', lang)
+if self.cnx is not None:
+self.cnx.set_session_props(lang=lang)
 # input form parameters management ########################################
 # common form parameters which should be protected against html values
 # XXX can't add 'eid' for instance since it may be multivalued
 # web state helpers #######################################################
 @property
 def message(self):
 try:
-return self.get_session_data(self._msgid, default=u'', pop=True)
+return self.session.data.pop(self._msgid, '')
 except AttributeError:
 try:
 return self._msg
 except AttributeError:
 return None
 return make_uid()
 def set_redirect_message(self, msg):
 assert isinstance(msg, unicode)
 msgid = self.redirect_message_id()
-self.set_session_data(msgid, msg)
+self.session.data[msgid] = msg
 return msgid
 def append_to_redirect_message(self, msg):
 msgid = self.redirect_message_id()
-currentmsg = self.get_session_data(msgid)
+currentmsg = self.session.data.get(msgid)
 if currentmsg is not None:
 currentmsg = '%s %s' % (currentmsg, msg)
 else:
 currentmsg = msg
-self.set_session_data(msgid, currentmsg)
+self.session.data[msgid] = currentmsg
 return msgid
 def reset_message(self):
 if hasattr(self, '_msg'):
 del self._msg
 def update_search_state(self):
 """update the current search state"""
 searchstate = self.form.get('__mode')
 if not searchstate and self.cnx is not None:
-searchstate = self.get_session_data('search_state', 'normal')
+searchstate = self.session.data.get('search_state', 'normal')
 self.set_search_state(searchstate)
 def set_search_state(self, searchstate):
 """set a new search state"""
 if searchstate is None or searchstate == 'normal':
 self.search_state = (searchstate or 'normal',)
 else:
 self.search_state = ('linksearch', searchstate.split(':'))
 assert len(self.search_state[-1]) == 4
 if self.cnx is not None:
-self.set_session_data('search_state', searchstate)
+self.session.data['search_state'] = searchstate
 def match_search_state(self, rset):
 """when searching an entity to create a relation, return True if entities in
 the given rset may be used as relation end
 """
 return False
 return True
 def update_breadcrumbs(self):
 """stores the last visisted page in session data"""
-searchstate = self.get_session_data('search_state')
+searchstate = self.session.data.get('search_state')
 if searchstate == 'normal':
-breadcrumbs = self.get_session_data('breadcrumbs', None)
+breadcrumbs = self.session.data.get('breadcrumbs')
 if breadcrumbs is None:
 breadcrumbs = SizeConstrainedList(10)
-self.set_session_data('breadcrumbs', breadcrumbs)
+self.session.data['breadcrumbs'] = breadcrumbs
 breadcrumbs.append(self.url())
 else:
 url = self.url()
 if breadcrumbs and breadcrumbs[-1] != url:
 breadcrumbs.append(url)
 def last_visited_page(self):
-breadcrumbs = self.get_session_data('breadcrumbs', None)
+breadcrumbs = self.session.data.get('breadcrumbs')
 if breadcrumbs:
 return breadcrumbs.pop()
 return self.base_url()
 def user_rql_callback(self, args, msg=None):
 assert cbname.startswith('cb_')
 self.info('unregistering callback %s for pageid %s', cbname, pageid)
 self.del_page_data(cbname)
 def clear_user_callbacks(self):
-if self.cnx is not None:
+if self.session is not None: # XXX
-sessdata = self.session_data()
+for key in self.session.data.keys():
-callbacks = [key for key in sessdata if key.startswith('cb_')]
+if key.startswith('cb_'):
-for callback in callbacks:
+del self.session.data[key]
-self.del_session_data(callback)
 # web edition helpers #####################################################
 @cached # so it's writed only once
 def fckeditor_config(self):
 """shortcut to clear req's pending_{delete,insert} entries
 This is needed when the edition is completed (whether it's validated
 or cancelled)
 """
-self.del_session_data('pending_insert')
+self.session.data.pop('pending_insert', None)
-self.del_session_data('pending_delete')
+self.session.data.pop('pending_delete', None)
 def cancel_edition(self, errorurl):
 """remove pending operations and `errorurl`'s specific stored data
 """
-self.del_session_data(errorurl)
+self.session.data.pop(errorurl, None)
 self.remove_pending_operations()
 # high level methods for HTTP headers management ##########################
 # must be cached since login/password are popped from the form dictionary
 # page data management ####################################################
 def get_page_data(self, key, default=None):
 """return value associated to `key` in curernt page data"""
-page_data = self.cnx.get_session_data(self.pageid, {})
+page_data = self.session.data.get(self.pageid)
+if page_data is None:
+return default
 return page_data.get(key, default)
 def set_page_data(self, key, value):
 """set value associated to `key` in current page data"""
 self.html_headers.add_unload_pagedata()
-page_data = self.cnx.get_session_data(self.pageid, {})
+page_data = self.session.data.setdefault(self.pageid, {})
 page_data[key] = value
-return self.cnx.set_session_data(self.pageid, page_data)
+self.session.data[self.pageid] = page_data
 def del_page_data(self, key=None):
 """remove value associated to `key` in current page data
 if `key` is None, all page data will be cleared
 """
 if key is None:
-self.cnx.del_session_data(self.pageid)
+self.session.data.pop(self.pageid, None)
 else:
-page_data = self.cnx.get_session_data(self.pageid, {})
+try:
-page_data.pop(key, None)
+del self.session.data[self.pageid][key]
-self.cnx.set_session_data(self.pageid, page_data)
+except KeyError:
+pass
 # user-agent detection ####################################################
 @cached
 def useragent(self):

changeset 5223	6abd6e3599f4
parent 5155	1dea6e0fdfc1
child 5244	5467674ad101