[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624) The older form is not necessary since we dropped python 2.5 compability. This will help Python 3.3 experimentation.

[toward-py3k] remove import with_statement (part of #2711624) They are unneeded since we dropped python 2.5 compatibility. This will help Python 3.3 experimentation.

pkg: drop python 2.5 compatibility (closes #2711624) 2.5 is not common anymore. Dropping compatibility will help moving to a code base compatible with Python 3.3

devtools: improve qunit timeout message Make the message clearer, shorter and properly wrapped.

merge default into stable

[devtools] fix broken windmill test case

Added tag cubicweb-debian-version-3.15.9-1 for changeset 29fbc632a696

Added tag cubicweb-version-3.15.9 for changeset 8bfc0753f1da

Added tag cubicweb-debian-version-3.16.0-1 for changeset 853237d1daf6

Added tag cubicweb-version-3.16.0 for changeset 6c7c2a02c9a0

3.15.9

[ldap test] fix bad merge

[merge] backport stable fixes

[cwctl] fix cubicweb-ctl shell command (closes #2583919) * add an uri parsing utility that documents a bit the uri cubicweb supports out of the box * cwctl: use this utility and refactor a bit for clarity (the novelty here being real support for old style 'myapp', or: * 'inmemory://myapp' * 'pyro://pyro-ns-host:pyro-ns-port/myapp' (pyro access through a pyro concentrator) * 'pyroloc://host:port/pyro-instance-id' (direct access to a pyro repository) * 'zmqpickle-tcp://host:port' * dbapi: refactor to sort out some of the complexity and restore functionality lost in 62213a34726e

[ldap test] move the slapd database directory to a tempdir (closes #2583993) This is required to be sure we are not hurt by NFS or such...