Patchwork [1,of,2] formatter: correct bool testing which should be __nonzero__ in Python 2

login
register
mail settings
Submitter Yuya Nishihara
Date Sept. 16, 2014, 3:59 p.m.
Message ID <41ce9361751ce40497dc.1410883166@mimosa>
Download mbox | patch
Permalink /patch/5829/
State Accepted
Headers show

Comments

Yuya Nishihara - Sept. 16, 2014, 3:59 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1410881463 -32400
#      Wed Sep 17 00:31:03 2014 +0900
# Node ID 41ce9361751ce40497dcbf29ec2d84ef0fbc7593
# Parent  eaeee6f95fc07ed22acd3e62db4d241d0ee97b84
formatter: correct bool testing which should be __nonzero__ in Python 2

Patch

diff --git a/mercurial/formatter.py b/mercurial/formatter.py
--- a/mercurial/formatter.py
+++ b/mercurial/formatter.py
@@ -16,7 +16,7 @@  class baseformatter(object):
         self._style = opts.get("style")
         self._template = opts.get("template")
         self._item = None
-    def __bool__(self):
+    def __nonzero__(self):
         '''return False if we're not doing real templating so we can
         skip extra work'''
         return True
@@ -51,7 +51,7 @@  class plainformatter(baseformatter):
     '''the default text output scheme'''
     def __init__(self, ui, topic, opts):
         baseformatter.__init__(self, ui, topic, opts)
-    def __bool__(self):
+    def __nonzero__(self):
         return False
     def startitem(self):
         pass