From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 26 Feb 2014 16:55:12 +0000 (+0000)
Subject: Merged r12935 from trunk to 2.4-stable (#16177)
X-Git-Tag: 2.4.4~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d7fd10f908169bd413d9d18d0475c3f3256a4b9;p=redmine.git

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

use Python getattr instead of hasattr.

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

diff --git a/lib/redmine/scm/adapters/mercurial/redminehelper.py b/lib/redmine/scm/adapters/mercurial/redminehelper.py
index 1e1bc8db1..d9a484e15 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)