web/webconfig.py
changeset 8989 8742f4bf029f
parent 8941 7b26fe71404f
child 9257 ce338133c92c
child 9317 0f2b80078aeb
equal deleted inserted replaced
8988:6cd912702239 8989:8742f4bf029f
    26 from os.path import join, exists, split, isdir
    26 from os.path import join, exists, split, isdir
    27 from warnings import warn
    27 from warnings import warn
    28 
    28 
    29 from logilab.common.decorators import cached, cachedproperty
    29 from logilab.common.decorators import cached, cachedproperty
    30 from logilab.common.deprecation import deprecated
    30 from logilab.common.deprecation import deprecated
       
    31 from logilab.common.configuration import merge_options
    31 
    32 
    32 from cubicweb import ConfigurationError
    33 from cubicweb import ConfigurationError
    33 from cubicweb.toolsutils import read_config
    34 from cubicweb.toolsutils import read_config
    34 from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options, merge_options
    35 from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options
    35 
    36 
    36 
    37 
    37 register_persistent_options( (
    38 register_persistent_options( (
    38     # site-wide only web ui configuration
    39     # site-wide only web ui configuration
    39     ('site-title',
    40     ('site-title',