From fd5cab1a3faef5d95cf6a31848575a61fa06fe9f Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 9 Mar 2021 19:35:09 +0100 Subject: [PATCH] dtoolutil: Rename Filename::__nonzero__() to __bool__() This is the Python 3 convention (even though interrogate supports both) --- dtool/src/dtoolutil/filename.I | 2 +- dtool/src/dtoolutil/filename.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dtool/src/dtoolutil/filename.I b/dtool/src/dtoolutil/filename.I index b23947320f..56ba90d838 100644 --- a/dtool/src/dtoolutil/filename.I +++ b/dtool/src/dtoolutil/filename.I @@ -608,7 +608,7 @@ compare_to(const Filename &other) const { * instead. */ INLINE bool Filename:: -__nonzero__() const { +__bool__() const { return !_filename.empty(); } diff --git a/dtool/src/dtoolutil/filename.h b/dtool/src/dtoolutil/filename.h index 66b38356a6..db0728f95c 100644 --- a/dtool/src/dtoolutil/filename.h +++ b/dtool/src/dtoolutil/filename.h @@ -232,7 +232,7 @@ PUBLISHED: INLINE bool operator != (const std::string &other) const; INLINE bool operator < (const std::string &other) const; INLINE int compare_to(const Filename &other) const; - INLINE bool __nonzero__() const; + INLINE bool __bool__() const; int get_hash() const; INLINE void output(std::ostream &out) const;