delegate '__nonzero__' to '__bool__' for py2/py3 compatibility in one source. #1350

This commit is contained in:
Takayuki Shimizukawa 2014-05-01 20:14:19 +09:00
parent 956d6286bf
commit 75e22ba522
3 changed files with 6 additions and 3 deletions

View File

@ -54,9 +54,10 @@ class DefDict(dict):
return dict.__getitem__(self, key)
except KeyError:
return self.default
def __nonzero__(self):
def __bool__(self):
# docutils check "if option_spec"
return True
__nonzero__ = __bool__ # for python2 compatibility
identity = lambda x: x

View File

@ -60,8 +60,9 @@ class _TranslationProxy(UserString, object):
def __contains__(self, key):
return key in self.data
def __nonzero__(self):
def __bool__(self):
return bool(self.data)
__nonzero__ = __bool__ # for python2 compatibility
def __dir__(self):
return dir(text_type)

View File

@ -246,7 +246,7 @@ class Element(object):
def __len__(self):
return len(self._children)
def __nonzero__(self):
def __bool__(self):
import warnings
warnings.warn(
"The behavior of this method will change in future versions. "
@ -254,6 +254,7 @@ class Element(object):
FutureWarning
)
return len(self._children) != 0 # emulate old behaviour
__nonzero__ = __bool__ # for python2 compatibility
##
# Returns the given subelement.