# HG changeset patch # User Augie Fackler # Date 2014-06-23 13:23:57 # Node ID e0b29a0c36c4b7d8fc6c1f3992c88b684576eadf # Parent e15c991fe2ec82944fcaf9a7696c78f07080e30d gendoc: restore use of callable() since it was readded in Python 3.2 diff --git a/doc/gendoc.py b/doc/gendoc.py --- a/doc/gendoc.py +++ b/doc/gendoc.py @@ -14,7 +14,6 @@ from mercurial.commands import table, gl 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 @@ def helpprinter(ui, helptable, sectionfu 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")