fix incorrect merges 3.26.{21,22} into 3.27

--HG--
branch : 3.27

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/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/server/test/unittest_rqlannotation.py

-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 # copyright 2003 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #

cubicweb/sobjects/test/unittest_supervising.py

-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 # copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #

cubicweb/web/views/json.py

@@ -82,10 +82,12 @@ class JsonMixIn(object):
     binary = True
 
     def wdata(self, data):
-        if '_indent' in self._cw.form:
-            indent = int(self._cw.form['_indent'])
-        else:
-            indent = None
+        indent = None
+        try:
+            if '_indent' in self._cw.form:
+                indent = int(self._cw.form['_indent'])
+        except AttributeError:
+            pass  # may occur with non-web connection
         # python's json.dumps escapes non-ascii characters
         self.w(json_dumps(data, indent=indent).encode('ascii'))
 

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,

debian/control

@@ -2,10 +2,9 @@ Source: cubicweb
 Section: web
 Priority: optional
 Maintainer: Logilab S.A. <contact@logilab.fr>
-Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>,
-           David Douard <david.douard@logilab.fr>,
+Uploaders: Nicolas Chauvat <nicolas.chauvat@logilab.fr>,
 Build-Depends:
- debhelper (>= 9.20160709),
+ debhelper (>= 12.1.1),
  dh-python,
  python3-all,
  python3-setuptools,