--- /dev/null
+.. _changelog:
+
+Changelog
+=========
+
+`trunk`
+-------
+
+- Removed support for `__terp__.py` descriptor files.
+- Removed support for `<terp>` root element in XML files.
api_models.rst
+Changelog
+'''''''''
+
+.. toctree::
+ :maxdepth: 1
+
+ changelog.rst
+
Concepts
''''''''
</rng:define>
<rng:start>
- <rng:choice>
- <rng:element name="openerp">
- <rng:oneOrMore>
- <rng:ref name="data" />
- </rng:oneOrMore>
- </rng:element>
- <rng:element name="terp">
- <rng:oneOrMore>
- <rng:ref name="data" />
- </rng:oneOrMore>
- </rng:element>
- </rng:choice>
+ <rng:element name="openerp">
+ <rng:oneOrMore>
+ <rng:ref name="data" />
+ </rng:oneOrMore>
+ </rng:element>
</rng:start>
</rng:grammar>
base = os.path.basename(path)
for f in osutil.listdir(path, True):
bf = os.path.basename(f)
- if not RE_exclude.search(bf) and (src or bf in ('__openerp__.py', '__terp__.py') or not bf.endswith('.py')):
+ if not RE_exclude.search(bf) and (src or bf == '__openerp__.py' or not bf.endswith('.py')):
archive.write(os.path.join(path, f), os.path.join(base, f))
archname = StringIO()
"""
terp_file = get_module_resource(module, '__openerp__.py')
- if not terp_file:
- terp_file = get_module_resource(module, '__terp__.py')
mod_path = get_module_path(module)
if terp_file:
info = {}
#TODO: refactor the logger in this file to follow the logging guidelines
# for 6.0
- _logger.debug('module %s: no descriptor file'
- ' found: __openerp__.py or __terp__.py (deprecated)', module)
+ _logger.debug('module %s: no __openerp__.py file found.', module)
return {}
return model_data_obj.get_object_reference(cr, self.uid, mod, id_str)
def parse(self, de):
- if not de.tag in ['terp', 'openerp']:
- _logger.error("Mismatch xml format")
- raise Exception( "Mismatch xml format: only terp or openerp as root tag" )
-
- if de.tag == 'terp':
- _logger.warning("The tag <terp/> is deprecated, use <openerp/>")
+ if de.tag != 'openerp':
+ raise Exception("Mismatch xml format: root tag must be `openerp`.")
for n in de.findall('./data'):
for rec in n: