Commit 5bf1be6a authored by Romain Courteaud's avatar Romain Courteaud

Use getattr instead of hasattr.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17327 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 79a10383
...@@ -68,7 +68,7 @@ class XMLMatrix(Folder): ...@@ -68,7 +68,7 @@ class XMLMatrix(Folder):
Access a cell at row and column Access a cell at row and column
""" """
base_id= kwd.get('base_id', "cell") base_id= kwd.get('base_id', "cell")
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return None return None
if not self.index.has_key(base_id): if not self.index.has_key(base_id):
...@@ -105,7 +105,7 @@ class XMLMatrix(Folder): ...@@ -105,7 +105,7 @@ class XMLMatrix(Folder):
Checks if matrix corresponding to base_id contains cell specified Checks if matrix corresponding to base_id contains cell specified
by *kw coordinates. by *kw coordinates.
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return 0 return 0
base_id= kwd.get('base_id', "cell") base_id= kwd.get('base_id', "cell")
...@@ -134,7 +134,7 @@ class XMLMatrix(Folder): ...@@ -134,7 +134,7 @@ class XMLMatrix(Folder):
""" """
aq_self = aq_base(self) aq_self = aq_base(self)
if not hasattr(aq_self, 'index'): if getattr(aq_self, 'index', None) is None:
return 0 return 0
if not self.index.has_key(base_id): if not self.index.has_key(base_id):
...@@ -153,7 +153,7 @@ class XMLMatrix(Folder): ...@@ -153,7 +153,7 @@ class XMLMatrix(Folder):
Checks if *kw coordinates are in the range of the Checks if *kw coordinates are in the range of the
matrix in kwd['base_id']. matrix in kwd['base_id'].
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return 0 return 0
base_id = kwd.get('base_id', "cell") base_id = kwd.get('base_id', "cell")
...@@ -183,7 +183,7 @@ class XMLMatrix(Folder): ...@@ -183,7 +183,7 @@ class XMLMatrix(Folder):
# between keys and ids of cells # between keys and ids of cells
base_id= kwd.get('base_id', "cell") base_id= kwd.get('base_id', "cell")
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
self.index = PersistentMapping() self.index = PersistentMapping()
# Return if previous range is the same # Return if previous range is the same
...@@ -473,7 +473,7 @@ class XMLMatrix(Folder): ...@@ -473,7 +473,7 @@ class XMLMatrix(Folder):
""" """
Returns the cell range as a list of index ids Returns the cell range as a list of index ids
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return [] return []
cell_range = self.index.get(base_id, None) cell_range = self.index.get(base_id, None)
if cell_range is None: return None if cell_range is None: return None
...@@ -490,7 +490,7 @@ class XMLMatrix(Folder): ...@@ -490,7 +490,7 @@ class XMLMatrix(Folder):
""" """
This method creates a new cell This method creates a new cell
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return None return None
base_id= kwd.get('base_id', "cell") base_id= kwd.get('base_id', "cell")
cell_id = base_id cell_id = base_id
...@@ -534,7 +534,7 @@ class XMLMatrix(Folder): ...@@ -534,7 +534,7 @@ class XMLMatrix(Folder):
""" """
Returns a list of possible keys as tuples Returns a list of possible keys as tuples
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return () return ()
if not self.index.has_key(base_id): if not self.index.has_key(base_id):
return () return ()
...@@ -578,7 +578,7 @@ class XMLMatrix(Folder): ...@@ -578,7 +578,7 @@ class XMLMatrix(Folder):
""" """
Returns a list of possible ids as tuples Returns a list of possible ids as tuples
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return () return ()
if not self.index.has_key(base_id): if not self.index.has_key(base_id):
return () return ()
...@@ -626,7 +626,7 @@ class XMLMatrix(Folder): ...@@ -626,7 +626,7 @@ class XMLMatrix(Folder):
""" """
Return possible base_id values Return possible base_id values
""" """
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
return () return ()
return self.index.keys() return self.index.keys()
...@@ -660,7 +660,7 @@ class XMLMatrix(Folder): ...@@ -660,7 +660,7 @@ class XMLMatrix(Folder):
to_delete = [] to_delete = []
errors = [] errors = []
# We make sure first that there is an index # We make sure first that there is an index
if not hasattr(aq_base(self), 'index'): if getattr(aq_base(self), 'index', None) is None:
self.index = PersistentMapping() self.index = PersistentMapping()
# We will check each cell of the matrix the matrix # We will check each cell of the matrix the matrix
for obj in self.objectValues(): for obj in self.objectValues():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment