# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 2011-07-25 20:07:09
# Node ID 28762bf809d8602d4ac7babd35d9443e7b64b515
# Parent  11aad09a637050930dd61c982167ba5af5988487

bookmarks: use getattr instead of hasattr

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -151,11 +151,10 @@ def update(repo, parents, node):
 def listbookmarks(repo):
     # We may try to list bookmarks on a repo type that does not
     # support it (e.g., statichttprepository).
-    if not hasattr(repo, '_bookmarks'):
-        return {}
+    marks = getattr(repo, '_bookmarks', {})
 
     d = {}
-    for k, v in repo._bookmarks.iteritems():
+    for k, v in marks.iteritems():
         d[k] = hex(v)
     return d