2.1 --- a/viewer.py Sat Jan 06 00:45:33 2007 +0100
2.2 +++ b/viewer.py Sun Jan 07 20:09:39 2007 +0100
2.3 @@ -879,12 +879,24 @@
2.4 self.stream.write("</div>\n")
2.5 self.stream.write("</div>\n")
2.6 else:
2.7 - if hasattr(node, "writes") and node.writes or hasattr(node, "accesses") and node.accesses:
2.8 + if hasattr(node, "accesses") and node.accesses:
2.9 self.stream.write("<div class='scopes'>\n")
2.10 - for ref in getattr(node, "writes", getattr(node, "accesses", {})).keys():
2.11 + for ref, accesses in node.accesses.items():
2.12 + fn = ref.full_name()
2.13 + for attr, access in accesses:
2.14 + access_fn = access.full_name()
2.15 + self.stream.write("<div class='scope'>")
2.16 + self.stream.write(self._text(fn))
2.17 + if ref != access:
2.18 + self.stream.write(" (via " + self._text(access_fn) + ")")
2.19 + self.stream.write("</div>\n")
2.20 + self.stream.write("</div>\n")
2.21 + if hasattr(node, "writes") and node.writes:
2.22 + self.stream.write("<div class='scopes'>\n")
2.23 + for ref in node.writes.keys():
2.24 fn = ref.full_name()
2.25 self.stream.write("<div class='scope'>")
2.26 - self.stream.write(self._text(fn))
2.27 + self.stream.write(self._text(fn))
2.28 self.stream.write("</div>\n")
2.29 self.stream.write("</div>\n")
2.30 if hasattr(node, "non_accesses") and node.non_accesses: