equal
deleted
inserted
replaced
25 from base64 import b64decode |
25 from base64 import b64decode |
26 |
26 |
27 from six import text_type |
27 from six import text_type |
28 |
28 |
29 from logilab.common import configuration |
29 from logilab.common import configuration |
|
30 from logilab.common.textutils import unormalize |
30 from logilab.common.deprecation import deprecated |
31 from logilab.common.deprecation import deprecated |
31 |
32 |
32 from yams.schema import role_name |
33 from yams.schema import role_name |
33 |
34 |
34 from cubicweb import ValidationError, set_log_methods, server |
35 from cubicweb import ValidationError, set_log_methods, server |
106 self.eid = eid |
107 self.eid = eid |
107 self.public_config = source_config.copy() |
108 self.public_config = source_config.copy() |
108 self.public_config['use-cwuri-as-url'] = self.use_cwuri_as_url |
109 self.public_config['use-cwuri-as-url'] = self.use_cwuri_as_url |
109 self.remove_sensitive_information(self.public_config) |
110 self.remove_sensitive_information(self.public_config) |
110 self.uri = source_config.pop('uri') |
111 self.uri = source_config.pop('uri') |
111 set_log_methods(self, getLogger('cubicweb.sources.'+self.uri)) |
112 # unormalize to avoid non-ascii characters in logger's name, this will cause decoding error |
|
113 # on logging |
|
114 set_log_methods(self, getLogger('cubicweb.sources.' + unormalize(unicode(self.uri)))) |
112 source_config.pop('type') |
115 source_config.pop('type') |
113 self.update_config(None, self.check_conf_dict(eid, source_config, |
116 self.update_config(None, self.check_conf_dict(eid, source_config, |
114 fail_if_unknown=False)) |
117 fail_if_unknown=False)) |
115 |
118 |
116 def __repr__(self): |
119 def __repr__(self): |