equal
deleted
inserted
replaced
25 from logging import getLogger |
25 from logging import getLogger |
26 from warnings import warn |
26 from warnings import warn |
27 |
27 |
28 from logilab.common.decorators import cached, clear_cache, monkeypatch |
28 from logilab.common.decorators import cached, clear_cache, monkeypatch |
29 from logilab.common.logging_ext import set_log_methods |
29 from logilab.common.logging_ext import set_log_methods |
30 from logilab.common.deprecation import deprecated, class_moved |
30 from logilab.common.deprecation import deprecated, class_moved, moved |
31 from logilab.common.textutils import splitstrip |
31 from logilab.common.textutils import splitstrip |
32 from logilab.common.graph import get_cycles |
32 from logilab.common.graph import get_cycles |
33 from logilab.common.compat import any |
33 from logilab.common.compat import any |
34 |
34 |
35 from yams import BadSchemaDefinition, buildobjs as ybo |
35 from yams import BadSchemaDefinition, buildobjs as ybo |
1248 # XXX deprecated |
1248 # XXX deprecated |
1249 |
1249 |
1250 from yams.buildobjs import RichString |
1250 from yams.buildobjs import RichString |
1251 from yams.constraints import StaticVocabularyConstraint |
1251 from yams.constraints import StaticVocabularyConstraint |
1252 |
1252 |
1253 RichString = class_moved(RichString) |
1253 try: # for yams < 0.35 |
|
1254 RichString = class_moved(RichString) |
|
1255 except TypeError: |
|
1256 RichString = moved('yams.buildobjs', 'RichString') |
1254 |
1257 |
1255 StaticVocabularyConstraint = class_moved(StaticVocabularyConstraint) |
1258 StaticVocabularyConstraint = class_moved(StaticVocabularyConstraint) |
1256 FormatConstraint = class_moved(FormatConstraint) |
1259 FormatConstraint = class_moved(FormatConstraint) |
1257 |
1260 |
1258 PyFileReader.context['ERQLExpression'] = yobsolete(ERQLExpression) |
1261 PyFileReader.context['ERQLExpression'] = yobsolete(ERQLExpression) |