diff -r a93ae0f6c0ad -r de974465d381 cwconfig.py --- a/cwconfig.py Mon Aug 03 14:14:07 2009 +0200 +++ b/cwconfig.py Mon Aug 03 15:16:47 2009 +0200 @@ -142,7 +142,7 @@ name = None # log messages format (see logging module documentation for available keys) log_format = '%(asctime)s - (%(name)s) %(levelname)s: %(message)s' - # nor remove vobjects based on unused interface + # nor remove appobjects based on unused interface cleanup_interface_sobjects = True if os.environ.get('APYCOT_ROOT'): @@ -419,8 +419,8 @@ except Exception, ex: cls.warning("can't init cube %s: %s", cube, ex) - cubicweb_vobject_path = set(['entities']) - cube_vobject_path = set(['entities']) + cubicweb_appobject_path = set(['entities']) + cube_appobject_path = set(['entities']) @classmethod def build_vregistry_path(cls, templpath, evobjpath=None, tvobjpath=None): @@ -430,13 +430,13 @@ :param evobjpath: optional list of sub-directories (or files without the .py ext) of the cubicweb library that should be tested and added to the output list - if they exists. If not give, default to `cubicweb_vobject_path` class + if they exists. If not give, default to `cubicweb_appobject_path` class attribute. :param tvobjpath: optional list of sub-directories (or files without the .py ext) of directories given in `templpath` that should be tested and added to the output list if they exists. If not give, default to - `cube_vobject_path` class attribute. + `cube_appobject_path` class attribute. """ vregpath = cls.build_vregistry_cubicweb_path(evobjpath) vregpath += cls.build_vregistry_cube_path(templpath, tvobjpath) @@ -446,7 +446,7 @@ def build_vregistry_cubicweb_path(cls, evobjpath=None): vregpath = [] if evobjpath is None: - evobjpath = cls.cubicweb_vobject_path + evobjpath = cls.cubicweb_appobject_path for subdir in evobjpath: path = join(CW_SOFTWARE_ROOT, subdir) if exists(path): @@ -457,7 +457,7 @@ def build_vregistry_cube_path(cls, templpath, tvobjpath=None): vregpath = [] if tvobjpath is None: - tvobjpath = cls.cube_vobject_path + tvobjpath = cls.cube_appobject_path for directory in templpath: for subdir in tvobjpath: path = join(directory, subdir)