Author: tmckay
Date: 2012-01-04 17:13:48 +0000 (Wed, 04 Jan 2012)
New Revision: 5183
Modified:
trunk/sage/python/sage/wallaby/wallabyoperations.py
Log:
Check for "name" attribute on node argument when node is not a string in
get_tag_names. Return empty list if name cannot be determined.
BZ771642
Modified: trunk/sage/python/sage/wallaby/wallabyoperations.py
===================================================================
--- trunk/sage/python/sage/wallaby/wallabyoperations.py 2011-12-22 18:32:48 UTC (rev
5182)
+++ trunk/sage/python/sage/wallaby/wallabyoperations.py 2012-01-04 17:13:48 UTC (rev
5183)
@@ -414,16 +414,20 @@
on the specified node.
'''
names = []
+ n = None
if type(node) in (str, unicode):
n = node
+ elif hasattr(node, "name"):
+ n = node.name
+ if n is None:
+ log.debug("WallabyOperations: get_tag_names(), parameter
'node' yields no name, returning []")
else:
- n = node.name
- self._lock.acquire()
- try:
- if n in self._cache[WBTypes.NODES].data:
- names = self._cache[WBTypes.NODES].data[n].getTags()
- finally:
- self._lock.release()
+ self._lock.acquire()
+ try:
+ if n in self._cache[WBTypes.NODES].data:
+ names = self._cache[WBTypes.NODES].data[n].getTags()
+ finally:
+ self._lock.release()
return names
def create_tags(self, names):
Show replies by date