merge 3.28 into 3.29

--HG--
branch : 3.29

cubicweb/devtools/webtest.py

-from __future__ import absolute_import
-
 import webtest
 
 from cubicweb.wsgi import handler

cubicweb/ext/markdown.py

-from __future__ import absolute_import
 import markdown
 
 import logging

cubicweb/misc/migration/3.22.0_Any.py

@@ -3,7 +3,7 @@ if confirm('use Europe/Paris as timezone?'):
 else:
     import pytz
     while True:
-        timezone = raw_input('enter your timezone')
+        timezone = input('enter your timezone')
         if timezone in pytz.common_timezones:
             break
 

cubicweb/misc/scripts/chpasswd.py

@@ -26,7 +26,7 @@ from cubicweb.server.utils import crypt_password
 if __args__:
     login = __args__.pop()
 else:
-    login = raw_input("login? ")
+    login = input("login? ")
 
 rset = rql('Any U WHERE U is CWUser, U login %(login)s', {'login': login})
 

cubicweb/misc/scripts/detect_cycle.py

-from __future__ import print_function
-
 try:
     rtype, = __args__
 except ValueError:

cubicweb/misc/scripts/ldap_change_base_dn.py

-from __future__ import print_function
-
 from base64 import b64decode, b64encode
 try:
     uri, newdn = __args__
@@ -12,7 +10,7 @@ olddn = repo.source_by_uri(uri).config['user-base-dn']
 
 assert olddn != newdn
 
-raw_input("Ensure you've stopped the instance, type enter when done.")
+input("Ensure you've stopped the instance, type enter when done.")
 
 for eid, olduserdn in rql("Any X, XURI WHERE X cwuri XURI, X cw_source S, S name %(name)s",
                           {'name': uri}):

cubicweb/utils.py

@@ -17,8 +17,6 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """Some utilities for CubicWeb server/clients."""
 
-from __future__ import division
-
 import base64
 import decimal
 import datetime

cubicweb/web/views/management.py

@@ -149,6 +149,9 @@ class ErrorView(AnyRsetView):
                 w(u"<b>Cube %s version:</b> %s<br/>\n" % (cube, cubeversion))
                 cversions.append((cube, cubeversion))
             w(u"</div>")
+        else:
+            eversion = self._cw._('no version information')
+            cversions = []
         # creates a bug submission link if submit-mail is set
         if self._cw.vreg.config['submit-mail']:
             form = self._cw.vreg['forms'].select('base', self._cw, rset=None,