--- a/rtags.py Tue Sep 14 15:40:10 2010 +0200
+++ b/rtags.py Tue Sep 14 15:40:31 2010 +0200
@@ -34,8 +34,6 @@
* ``tag_subject_of`` tag a relation in the subject's context
* ``tag_object_of`` tag a relation in the object's context
* ``tag_attribute`` shortcut for tag_subject_of
-
-
"""
__docformat__ = "restructuredtext en"
--- a/web/views/basecontrollers.py Tue Sep 14 15:40:10 2010 +0200
+++ b/web/views/basecontrollers.py Tue Sep 14 15:40:31 2010 +0200
@@ -260,9 +260,8 @@
def optional_kwargs(extraargs):
if extraargs is None:
return {}
- else: # we receive unicode keys which is not supported by the **syntax
- return dict((str(key), value)
- for key, value in extraargs.items())
+ # we receive unicode keys which is not supported by the **syntax
+ return dict((str(key), value) for key, value in extraargs.iteritems())
class JSonController(Controller):
__regid__ = 'json'
@@ -428,15 +427,16 @@
return self._call_view(comp, **extraargs)
@xhtmlize
- def js_render(self, registry, oid, eid=None, selectargs=None, renderargs=None):
+ def js_render(self, registry, oid, eid=None,
+ selectargs=None, renderargs=None):
if eid is not None:
rset = self._cw.eid_rset(eid)
elif self._cw.form.get('rql'):
rset = self._cw.execute(self._cw.form['rql'])
else:
rset = None
- selectargs = optional_kwargs(selectargs)
- view = self._cw.vreg[registry].select(oid, self._cw, rset=rset, **selectargs)
+ view = self._cw.vreg[registry].select(oid, self._cw, rset=rset,
+ **optional_kwargs(selectargs))
return self._call_view(view, **optional_kwargs(renderargs))
@check_pageid
--- a/web/views/sessions.py Tue Sep 14 15:40:10 2010 +0200
+++ b/web/views/sessions.py Tue Sep 14 15:40:31 2010 +0200
@@ -17,8 +17,8 @@
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
"""web session component: by dfault the session is actually the db connection
object :/
+"""
-"""
__docformat__ = "restructuredtext en"
from cubicweb.web import InvalidSession
--- a/web/views/tableview.py Tue Sep 14 15:40:10 2010 +0200
+++ b/web/views/tableview.py Tue Sep 14 15:40:31 2010 +0200
@@ -324,7 +324,8 @@
title = None
def call(self, title=None, subvid=None, headers=None, divid=None,
- paginate=False, displaycols=None, displayactions=None, mainindex=None):
+ paginate=False, displaycols=None, displayactions=None,
+ mainindex=None):
"""Dumps a table displaying a composite query"""
try:
actrql = self._cw.form['actualrql']
@@ -347,7 +348,8 @@
mainindex = self.main_var_index()
if mainindex is not None:
actions = self.form_filter(divid, displaycols, displayactions,
- displayfilter=True, paginate=paginate, hidden=True)
+ displayfilter=True, paginate=paginate,
+ hidden=True)
else:
actions = ()
if not subvid and 'subvid' in self._cw.form: