Mercurial > public > mercurial-scm > hg-stable

diff doc/gendoc.py @ 21926:6c36dc6cd61a stable 3.1-rc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 3.1 code freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 19 Jul 2014 00:10:22 -0500
parents e0b29a0c36c4
children 7e8e3c0920a6
line wrap: on
line diff
--- a/doc/gendoc.py	Sat Jul 12 02:23:17 2014 -0700
+++ b/doc/gendoc.py	Sat Jul 19 00:10:22 2014 -0500
@@ -14,7 +14,6 @@
 from mercurial.i18n import gettext, _
 from mercurial.help import helptable, loaddoc
 from mercurial import extensions
-from mercurial import util
 
 def get_desc(docstr):
     if not docstr:
@@ -137,7 +136,7 @@
         ui.write("\n")
         if sectionfunc:
             ui.write(sectionfunc(sec))
-        if util.safehasattr(doc, '__call__'):
+        if callable(doc):
             doc = doc()
         ui.write(doc)
         ui.write("\n")