From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Wed, 24 Mar 2010 16:32:22 +0000 (+0100)
Subject: [REF] 'children' instead of 'childs'
X-Git-Tag: 6.0.0-rc2-addons~408^2~2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=25a424a89d32e4485ae1e120c1d8b2ada216800e;p=odoo%2Fodoo.git

[REF] 'children' instead of 'childs'

lp bug: https://launchpad.net/bugs/327259 fixed

bzr revid: ls@numerigraphe.fr-20100324163222-dj03gxme8sawtdmz
---

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 01ea8cc..223a9ac 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -46,8 +46,8 @@ class module_category(osv.osv):
         result = dict(cr.fetchall())
         for id in ids:
             cr.execute('select id from ir_module_category where parent_id=%s', (id,))
-            childs = [c for c, in cr.fetchall()]
-            result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for c in childs], result.get(id, 0))
+            children = [c for c, in cr.fetchall()]
+            result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for c in children], result.get(id, 0))
         return result
 
     _columns = {
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index bcd0543..3d2e3d7 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1085,7 +1085,7 @@ class orm_template(object):
             context = {}
         result = False
         fields = {}
-        childs = True
+        children = True
 
         if node.tag == 'field':
             if node.get('name'):
@@ -1100,7 +1100,7 @@ class orm_template(object):
 
                 if column:
                     relation = column._obj
-                    childs = False
+                    children = False
                     views = {}
                     for f in node:
                         if f.tag in ('form', 'tree', 'graph'):
@@ -1159,7 +1159,7 @@ class orm_template(object):
                 if trans:
                     node.set('sum', trans)
 
-        if childs:
+        if children:
             for f in node:
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
@@ -1966,8 +1966,8 @@ class orm(orm_template):
                 where += ' order by '+self._parent_order
             cr.execute('SELECT id FROM '+self._table+' WHERE '+where)
             pos2 = pos + 1
-            childs = cr.fetchall()
-            for id in childs:
+            children = cr.fetchall()
+            for id in children:
                 pos2 = browse_rec(id[0], pos2)
             cr.execute('update '+self._table+' set parent_left=%s, parent_right=%s where id=%s', (pos,pos2,root))
             return pos2+1
diff --git a/bin/report/print_xml.py b/bin/report/print_xml.py
index 2c24d37..a452704 100644
--- a/bin/report/print_xml.py
+++ b/bin/report/print_xml.py
@@ -253,7 +253,7 @@ class document(object):
                             for el_cld in node:
                                 self.parse_node(el_cld, el, v)
             else:
-                # if there is no "type" attribute in the node, copy it to the xml data and parse its childs
+                # if there is no "type" attribute in the node, copy it to the xml data and parse its children
                 if not node.tag == etree.Comment:
                     if node.tag == parent.tag:
                         el = parent
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 0574f56..02352b4 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -489,8 +489,8 @@ class _rml_flowable(object):
         return rc1
 
     def _table(self, node):
-        childs = utils._child_get(node,self,'tr')
-        if not childs:
+        children = utils._child_get(node,self,'tr')
+        if not children:
             return None
         length = 0
         colwidths = None
@@ -498,7 +498,7 @@ class _rml_flowable(object):
         data = []
         styles = []
         posy = 0
-        for tr in childs:
+        for tr in children:
             paraStyle = None
             if tr.get('style'):
                 st = copy.deepcopy(self.styles.table_styles[tr.get('style')])