Iterate over pool elements with correct tag type only

michael-os · michael-os · commit 0b62b4d5924a · 2015-06-23T22:48:05.000+02:00
diff --git a/oca/group.py b/oca/group.py
@@ -54,7 +54,7 @@ class GroupPool(Pool):
     }
 
     def __init__(self, client):
-        super(GroupPool, self).__init__('GROUP_POOL', 'POOL', client)
+        super(GroupPool, self).__init__('GROUP_POOL', 'GROUP', client)
 
     def _factory(self, xml):
         i = Group(xml, self.client)
diff --git a/oca/image.py b/oca/image.py
@@ -186,7 +186,7 @@ class ImagePool(Pool):
     }
 
     def __init__(self, client):
-        super(ImagePool, self).__init__('IMAGE_POOL', 'POOL', client)
+        super(ImagePool, self).__init__('IMAGE_POOL', 'IMAGE', client)
 
     def _factory(self, xml):
         i = Image(xml, self.client)
diff --git a/oca/pool.py b/oca/pool.py
@@ -108,7 +108,7 @@ def info(self, filter=-3, range_start=-1, range_end=-1, *args):
         data = self.client.call(self.METHODS['info'], filter,
                                         range_start, range_end, *args)
         self._initialize_xml(data, self.pool_name)
-        for element in self.xml:
+        for element in self.xml.findall(self.element_name):
             self.append(self._factory(element))
 
     def _factory(self):
diff --git a/oca/template.py b/oca/template.py
@@ -95,7 +95,7 @@ class VmTemplatePool(Pool):
     }
 
     def __init__(self, client):
-        super(VmTemplatePool, self).__init__('VMTEMPLATE_POOL', 'POOL', client)
+        super(VmTemplatePool, self).__init__('VMTEMPLATE_POOL', 'VMTEMPLATE', client)
 
     #def info(self, 
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class GroupPool(Pool):`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`def __init__(self, client):`
`57`		`- super(GroupPool, self).__init__('GROUP_POOL', 'POOL', client)`
	`57`	`+ super(GroupPool, self).__init__('GROUP_POOL', 'GROUP', client)`
`58`	`58`
`59`	`59`	`def _factory(self, xml):`
`60`	`60`	`i = Group(xml, self.client)`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ class ImagePool(Pool):`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`def __init__(self, client):`
`189`		`- super(ImagePool, self).__init__('IMAGE_POOL', 'POOL', client)`
	`189`	`+ super(ImagePool, self).__init__('IMAGE_POOL', 'IMAGE', client)`
`190`	`190`
`191`	`191`	`def _factory(self, xml):`
`192`	`192`	`i = Image(xml, self.client)`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class VmTemplatePool(Pool):`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`def __init__(self, client):`
`98`		`- super(VmTemplatePool, self).__init__('VMTEMPLATE_POOL', 'POOL', client)`
	`98`	`+ super(VmTemplatePool, self).__init__('VMTEMPLATE_POOL', 'VMTEMPLATE', client)`
`99`	`99`
`100`	`100`	`#def info(self,`
`101`	`101`