--- a/.hgtags Thu Oct 24 13:15:53 2013 +0200
+++ b/.hgtags Fri Jan 10 17:12:20 2014 +0100
@@ -319,3 +319,4 @@
7f67db7c848ec20152daf489d9e11f0fc8402e9b cubicweb-centos-version-3.17.11-1
7f67db7c848ec20152daf489d9e11f0fc8402e9b cubicweb-version-3.17.11
7f67db7c848ec20152daf489d9e11f0fc8402e9b cubicweb-debian-version-3.17.11-1
+b02e2912cad5d80395e488c55b548495e8320198 cubicweb-debian-version-3.17.11-2
--- a/dbapi.py Thu Oct 24 13:15:53 2013 +0200
+++ b/dbapi.py Fri Jan 10 17:12:20 2014 +0100
@@ -270,7 +270,7 @@
raises an AuthenticationError if anonymous usage is not allowed
"""
anoninfo = vreg.config.anonymous_user()
- if anoninfo is None: # no anonymous user
+ if anoninfo[0] is None: # no anonymous user
raise AuthenticationError('anonymous access is not authorized')
anon_login, anon_password = anoninfo
# use vreg's repository cache
--- a/debian/changelog Thu Oct 24 13:15:53 2013 +0200
+++ b/debian/changelog Fri Jan 10 17:12:20 2014 +0100
@@ -1,3 +1,10 @@
+cubicweb (3.17.11-2) unstable; urgency=low
+
+ * Override lintian false-positive about debian/rules.tmpl in the cube
+ skeleton.
+
+ -- Julien Cristau <julien.cristau@logilab.fr> Wed, 11 Dec 2013 15:56:39 +0100
+
cubicweb (3.17.11-1) unstable; urgency=low
* new upstream release
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/cubicweb-dev.lintian-overrides Fri Jan 10 17:12:20 2014 +0100
@@ -0,0 +1,1 @@
+missing-dep-for-interpreter make => make | build-essential | dpkg-dev (usr/share/pyshared/cubicweb/skeleton/debian/rules.tmpl)
--- a/doc/book/en/devweb/views/wdoc.rst Thu Oct 24 13:15:53 2013 +0200
+++ b/doc/book/en/devweb/views/wdoc.rst Fri Jan 10 17:12:20 2014 +0100
@@ -8,10 +8,8 @@
Help views
----------
.. autoclass:: cubicweb.web.views.wdoc.InlineHelpView
-.. autoclass:: cubicweb.web.views.wdoc.ChangeLogView
Actions
-------
.. autoclass:: cubicweb.web.views.wdoc.HelpAction
-.. autoclass:: cubicweb.web.views.wdoc.ChangeLogAction
.. autoclass:: cubicweb.web.views.wdoc.AboutAction
--- a/entities/__init__.py Thu Oct 24 13:15:53 2013 +0200
+++ b/entities/__init__.py Fri Jan 10 17:12:20 2014 +0100
@@ -1,4 +1,4 @@
-# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of CubicWeb.
@@ -33,6 +33,11 @@
__regid__ = 'Any'
__implements__ = ()
+ @classproperty
+ def cw_etype(cls):
+ """entity type as a string"""
+ return cls.__regid__
+
@classmethod
def cw_create_url(cls, req, **kwargs):
""" return the url of the entity creation form for this entity type"""
@@ -58,11 +63,6 @@
# meta data api ###########################################################
- @classproperty
- def cw_etype(self):
- """entity Etype as a string"""
- return self.__regid__
-
def dc_title(self):
"""return a suitable *unicode* title for this entity"""
for rschema, attrschema in self.e_schema.attribute_definitions():
--- a/server/server.py Thu Oct 24 13:15:53 2013 +0200
+++ b/server/server.py Fri Jan 10 17:12:20 2014 +0100
@@ -48,7 +48,7 @@
def is_ready(self):
"""return true if the event is ready to be fired"""
now = self.timefunc()
- if self.absolute < now:
+ if self.absolute <= now:
return True
return False
@@ -109,7 +109,8 @@
self.daemon.handleRequests(req_timeout)
except select.error:
continue
- self.trigger_events()
+ finally:
+ self.trigger_events()
def quit(self):
"""stop the server"""
--- a/server/session.py Thu Oct 24 13:15:53 2013 +0200
+++ b/server/session.py Fri Jan 10 17:12:20 2014 +0100
@@ -711,6 +711,7 @@
This is to be used by session"""
def meth_from_tx(session, *args, **kwargs):
return getattr(session._tx, meth_name)(*args, **kwargs)
+ meth_from_tx.__doc__ = getattr(Transaction, meth_name).__doc__
return meth_from_tx
@@ -767,8 +768,8 @@
used by another session as long as no writing is done. This means we can
have multiple sessions with a reasonably low connections set pool size.
- .. automethod:: cubicweb.server.session.set_cnxset
- .. automethod:: cubicweb.server.session.free_cnxset
+ .. automethod:: cubicweb.server.session.Session.set_cnxset
+ .. automethod:: cubicweb.server.session.Session.free_cnxset
:attr:`mode`, string telling the connections set handling mode, may be one
of 'read' (connections set may be freed), 'write' (some write was done in
--- a/server/test/data/extern_mapping.py Thu Oct 24 13:15:53 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
-# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
-#
-# This file is part of CubicWeb.
-#
-# CubicWeb is free software: you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, either version 2.1 of the License, or (at your option)
-# any later version.
-#
-# CubicWeb is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
-"""mapping file for source used in unittest_multisources.py"""
-
-support_entities = {'Card': True, 'Affaire': True, 'State': True}
-support_relations = {'in_state': True, 'documented_by': True, 'multisource_inlined_rel': True}
-
-cross_relations = set( ('documented_by',) )
--- a/web/application.py Thu Oct 24 13:15:53 2013 +0200
+++ b/web/application.py Fri Jan 10 17:12:20 2014 +0100
@@ -65,7 +65,7 @@
self.session_time = vreg.config['http-session-time'] or None
self.authmanager = vreg['components'].select('authmanager', vreg=vreg)
interval = (self.session_time or 0) / 2.
- if vreg.config.anonymous_user() is not None:
+ if vreg.config.anonymous_user()[0] is not None:
self.cleanup_anon_session_time = vreg.config['cleanup-anonymous-session-time'] or 5 * 60
assert self.cleanup_anon_session_time > 0
if self.session_time is not None:
--- a/web/views/tableview.py Thu Oct 24 13:15:53 2013 +0200
+++ b/web/views/tableview.py Fri Jan 10 17:12:20 2014 +0100
@@ -867,7 +867,7 @@
class EntityTableView(TableMixIn, EntityView):
"""This abstract table view is designed to be used with an
:class:`is_instance()` or :class:`adaptable` predicate, hence doesn't depend
- the result set shape as the :class:`TableView` does.
+ the result set shape as the :class:`RsetTableView` does.
It will display columns that should be defined using the `columns` class
attribute containing a list of column ids. By default, each column is
--- a/web/views/timeline.py Thu Oct 24 13:15:53 2013 +0200
+++ b/web/views/timeline.py Fri Jan 10 17:12:20 2014 +0100
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Lesser General Public License along
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
-"""basic support for SIMILE's timline widgets
+"""basic support for SIMILE's timeline widgets
cf. http://code.google.com/p/simile-widgets/
"""