equal
deleted
inserted
replaced
23 import re |
23 import re |
24 from os.path import join, basename |
24 from os.path import join, basename |
25 from logging import getLogger |
25 from logging import getLogger |
26 from warnings import warn |
26 from warnings import warn |
27 |
27 |
28 from six import string_types, add_metaclass |
28 from six import text_type, string_types, add_metaclass |
29 from six.moves import range |
29 from six.moves import range |
30 |
30 |
31 from logilab.common import tempattr |
31 from logilab.common import tempattr |
32 from logilab.common.decorators import cached, clear_cache, monkeypatch, cachedproperty |
32 from logilab.common.decorators import cached, clear_cache, monkeypatch, cachedproperty |
33 from logilab.common.logging_ext import set_log_methods |
33 from logilab.common.logging_ext import set_log_methods |
555 form = '' |
555 form = '' |
556 if form: |
556 if form: |
557 key = key + '_' + form |
557 key = key + '_' + form |
558 # ensure unicode |
558 # ensure unicode |
559 if context is not None: |
559 if context is not None: |
560 return unicode(req.pgettext(context, key)) |
560 return text_type(req.pgettext(context, key)) |
561 else: |
561 else: |
562 return unicode(req._(key)) |
562 return text_type(req._(key)) |
563 |
563 |
564 |
564 |
565 # Schema objects definition ################################################### |
565 # Schema objects definition ################################################### |
566 |
566 |
567 def ERSchema_display_name(self, req, form='', context=None): |
567 def ERSchema_display_name(self, req, form='', context=None): |