From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 26 Feb 2014 16:53:51 +0000 (+0000)
Subject: Merged r12935 from trunk to 2.5-stable (#16177)
X-Git-Tag: 2.5.0~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0d5dd6fc1902310085603ff45451c0d2ef2a15dc;p=redmine.git

Merged r12935 from trunk to 2.5-stable (#16177)

use Python getattr instead of hasattr.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12936 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/mercurial/redminehelper.py b/lib/redmine/scm/adapters/mercurial/redminehelper.py
index 6056dd803..b7d98a18f 100644
--- a/lib/redmine/scm/adapters/mercurial/redminehelper.py
+++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py
@@ -79,7 +79,7 @@ def _tags(ui, repo):
 def _branches(ui, repo):
     # see mercurial/commands.py:branches
     def iterbranches():
-        if hasattr(repo, 'branchtags'):
+        if getattr(repo, 'branchtags', None) is not None:
             # Mercurial < 2.9
             for t, n in repo.branchtags().iteritems():
                 yield t, n, repo.changelog.rev(n)