diff -r 6b3523f81f42 -r 26744ad37953 cubicweb/server/sources/__init__.py --- a/cubicweb/server/sources/__init__.py Fri Apr 05 17:21:14 2019 +0200 +++ b/cubicweb/server/sources/__init__.py Fri Apr 05 17:58:19 2019 +0200 @@ -17,13 +17,9 @@ # with CubicWeb. If not, see . """cubicweb server sources support""" -from __future__ import print_function - from time import time from logging import getLogger -from six import text_type - from logilab.common import configuration from logilab.common.textutils import unormalize @@ -97,7 +93,7 @@ self.uri = source_config.pop('uri') # unormalize to avoid non-ascii characters in logger's name, this will cause decoding error # on logging - set_log_methods(self, getLogger('cubicweb.sources.' + unormalize(text_type(self.uri)))) + set_log_methods(self, getLogger('cubicweb.sources.' + unormalize(self.uri))) source_config.pop('type') self.config = self._check_config_dict( eid, source_config, raise_on_error=False) @@ -155,7 +151,7 @@ except Exception as ex: if not raise_on_error: continue - msg = text_type(ex) + msg = str(ex) raise ValidationError(eid, {role_name('config', 'subject'): msg}) processed[optname] = value # cw < 3.10 bw compat