From 229870f9c91254ccef297955d94ef5ef1f281375 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 12 Oct 2018 23:57:35 -0700 Subject: [PATCH] Add a __bool__ for every __nonzero__ that doesn't already have one --- etg/bitmap.py | 5 ++--- etg/brush.py | 6 ++---- etg/caret.py | 5 ++--- etg/cmndata.py | 15 ++++++--------- etg/colour.py | 4 +++- etg/cursor.py | 5 ++--- etg/dataview.py | 10 ++++------ etg/dc.py | 5 ++--- etg/font.py | 5 ++--- etg/gbsizer.py | 2 ++ etg/gdicmn.py | 4 +++- etg/geometry.py | 2 ++ etg/graphics.py | 3 ++- etg/grid.py | 1 + etg/icon.py | 4 ++-- etg/iconloc.py | 4 ++-- etg/image.py | 1 + etg/intl.py | 1 + etg/position.py | 1 + etg/printfw.py | 6 +++--- etg/rawbmp.py | 12 ++++-------- etg/richtextbuffer.py | 7 +++++++ etg/sound.py | 5 ++--- etg/treectrl.py | 5 ++--- etg/treelist.py | 5 ++--- etg/vidmode.py | 5 ++--- 26 files changed, 64 insertions(+), 64 deletions(-) diff --git a/etg/bitmap.py b/etg/bitmap.py index 29da7110..113562a2 100644 --- a/etg/bitmap.py +++ b/etg/bitmap.py @@ -94,9 +94,8 @@ def run(): self->SetMask(mask); """) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('long', 'GetHandle', '()', doc='MSW-only method to fetch the windows handle for the bitmap.', diff --git a/etg/brush.py b/etg/brush.py index 16ecb553..2bb5d724 100644 --- a/etg/brush.py +++ b/etg/brush.py @@ -40,10 +40,8 @@ def run(): if ctor.isCtor and ctor.argsString != '()': ctor.mustHaveApp() - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) - + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppCode("""\ #ifdef __WXMAC__ diff --git a/etg/caret.py b/etg/caret.py index 46e38829..878dac82 100644 --- a/etg/caret.py +++ b/etg/caret.py @@ -39,9 +39,8 @@ def run(): c.find('GetPosition').findOverload('int *').ignore() c.find('GetSize').findOverload('int *').ignore() - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") #----------------------------------------------------------------- diff --git a/etg/cmndata.py b/etg/cmndata.py index 6cbf1b94..9ee4e6d8 100644 --- a/etg/cmndata.py +++ b/etg/cmndata.py @@ -41,9 +41,8 @@ def run(): c.find('GetPrintData').overloads = [] - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addProperty('MarginBottomRight', 'GetMarginBottomRight', 'SetMarginBottomRight') c.addProperty('MarginTopLeft', 'GetMarginTopLeft', 'SetMarginTopLeft') @@ -62,9 +61,8 @@ def run(): c.addCppMethod('wxSize*', 'GetPaperSize', '()', 'return new wxSize(self->GetPaperSize());') c.addCppMethod('void', 'SetPaperSize', '(const wxSize* sz)', 'self->SetPaperSize(*sz);') - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") # TODO: These two methods should use something other than a PyString for # holding the data... @@ -95,9 +93,8 @@ def run(): tools.removeVirtuals(c) c.find('SetSetupDialog').ignore() - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addAutoProperties() diff --git a/etg/colour.py b/etg/colour.py index d6febd65..98e2996f 100644 --- a/etg/colour.py +++ b/etg/colour.py @@ -171,7 +171,6 @@ def run(): c.addPyMethod('__str__', '(self)', 'return str(self.Get())') c.addPyMethod('__repr__', '(self)', 'return "wx.Colour"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') - c.addPyMethod('__nonzero__', '(self)', 'return self.IsOk()') c.addPyMethod('__reduce__', '(self)', 'return (Colour, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', @@ -184,6 +183,9 @@ def run(): """) c.addPyCode('Colour.__safe_for_unpickling__ = True') + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") + # Types that can be converted to wx.Colour: # wxColour (duh) # Sequence with 3 or 4 integers diff --git a/etg/cursor.py b/etg/cursor.py index 7ae72212..f705c67a 100644 --- a/etg/cursor.py +++ b/etg/cursor.py @@ -46,9 +46,8 @@ def run(): # TODO: This ctor ^^ in Classic has a custom implementation for wxGTK that # sets the hotspot. Is that still needed? - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('long', 'GetHandle', '()', """\ #ifdef __WXMSW__ diff --git a/etg/dataview.py b/etg/dataview.py index 39814f13..50724d49 100644 --- a/etg/dataview.py +++ b/etg/dataview.py @@ -80,12 +80,10 @@ def run(): c = module.find('wxDataViewItem') assert isinstance(c, etgtools.ClassDef) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) - c.addCppMethod('long', '__hash__', '()', """\ - return (long)self->GetID(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") + c.addCppMethod('long', '__hash__', '()', "return (long)self->GetID();") + c.addCppMethod('bool', '__eq__', '(wxDataViewItem* other)', "return other ? (self->GetID() == other->GetID()) : false;") c.addCppMethod('bool', '__ne__', '(wxDataViewItem* other)', diff --git a/etg/dc.py b/etg/dc.py index 46dbd32c..91be3656 100644 --- a/etg/dc.py +++ b/etg/dc.py @@ -225,9 +225,8 @@ def run(): """) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addPyMethod('GetBoundingBox', '(self)', doc="""\ GetBoundingBox() -> (x1,y1, x2,y2)\n diff --git a/etg/font.py b/etg/font.py index 2451cbec..3256cc38 100644 --- a/etg/font.py +++ b/etg/font.py @@ -85,9 +85,8 @@ def run(): #c.addProperty('Underlined GetUnderlined SetUnderlined') #c.addProperty('Strikethrough GetStrikethrough SetStrikethrough') - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('void*', 'GetHFONT', '()', doc="Returns the font's native handle.", diff --git a/etg/gbsizer.py b/etg/gbsizer.py index 99aafe0c..c60ac499 100644 --- a/etg/gbsizer.py +++ b/etg/gbsizer.py @@ -60,6 +60,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.GBPosition"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (GBPosition, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', @@ -104,6 +105,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.GBSpan"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (GBSpan, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', diff --git a/etg/gdicmn.py b/etg/gdicmn.py index 41befec1..78dc54b6 100644 --- a/etg/gdicmn.py +++ b/etg/gdicmn.py @@ -117,7 +117,6 @@ def run(): c.addPyMethod('__str__', '(self)', 'return str(self.Get())') c.addPyMethod('__repr__', '(self)', 'return "wx.Point"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') - c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Point, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', @@ -192,6 +191,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.Size"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Size, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', @@ -273,6 +273,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.Rect"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0,0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0,0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Rect, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', @@ -334,6 +335,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.RealPoint"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Rect, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', diff --git a/etg/geometry.py b/etg/geometry.py index 024a8c2f..5a6e54f5 100644 --- a/etg/geometry.py +++ b/etg/geometry.py @@ -72,6 +72,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.Point2D"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Point2D, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', @@ -120,6 +121,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.Rect2D"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0,0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0,0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Rect2D, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', diff --git a/etg/graphics.py b/etg/graphics.py index cae2633e..aafb88ce 100644 --- a/etg/graphics.py +++ b/etg/graphics.py @@ -61,6 +61,7 @@ def run(): c.mustHaveApp() c.addCppMethod('bool', 'IsOk', '()', 'return !self->IsNull();') c.addCppMethod('int', '__nonzero__', '()', "return !self->IsNull();") + c.addCppMethod('int', '__bool__', '()', "return !self->IsNull();") #--------------------------------------------- @@ -85,7 +86,7 @@ def run(): #if wxUSE_ENH_METAFILE return wxGraphicsContext::Create(*metaFileDC); #endif - #endif + #endif wxPyRaiseNotImplemented(); return NULL; """) diff --git a/etg/grid.py b/etg/grid.py index 7dac1828..7d0ae5d9 100644 --- a/etg/grid.py +++ b/etg/grid.py @@ -111,6 +111,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "GridCellCoords"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (GridCellCoords, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', diff --git a/etg/icon.py b/etg/icon.py index 0c70d214..eb93344d 100644 --- a/etg/icon.py +++ b/etg/icon.py @@ -51,8 +51,8 @@ def run(): return icon; """) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk();""") + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('long', 'GetHandle', '()', """\ #ifdef __WXMSW__ diff --git a/etg/iconloc.py b/etg/iconloc.py index ba332a67..e5f7c92a 100644 --- a/etg/iconloc.py +++ b/etg/iconloc.py @@ -43,8 +43,8 @@ def run(): #endif """) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk();""") + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('int', 'GetIndex', '()', """\ #ifdef __WXMSW__ diff --git a/etg/image.py b/etg/image.py index 4129a352..17f04549 100644 --- a/etg/image.py +++ b/etg/image.py @@ -359,6 +359,7 @@ def run(): c.addCppMethod('int', '__nonzero__', '()', 'return self->IsOk();') + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addPyMethod('ConvertToBitmap', '(self, depth=-1)', doc="""\ diff --git a/etg/intl.py b/etg/intl.py index abc542c0..43422e83 100644 --- a/etg/intl.py +++ b/etg/intl.py @@ -40,6 +40,7 @@ def run(): c.addPrivateCopyCtor() c.addCppMethod('int', '__nonzero__', '()', 'return self->IsOk();') + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c = module.find('wxLanguageInfo') diff --git a/etg/position.py b/etg/position.py index bb54c095..c1eb675f 100644 --- a/etg/position.py +++ b/etg/position.py @@ -50,6 +50,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "wx.Position"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (Position, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', diff --git a/etg/printfw.py b/etg/printfw.py index 50995ae3..0d0500ff 100644 --- a/etg/printfw.py +++ b/etg/printfw.py @@ -72,9 +72,9 @@ def run(): ctor.find('printout').transfer = True ctor.find('printoutForPrinting').transfer = True c.addPrivateCopyCtor() - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") + c.addPyCode("PrintPreview.Ok = wx.deprecated(PrintPreview.IsOk, 'Use IsOk instead.')") c = module.find('wxPrinter') diff --git a/etg/rawbmp.py b/etg/rawbmp.py index 257e4ccd..bfc9bc35 100644 --- a/etg/rawbmp.py +++ b/etg/rawbmp.py @@ -171,10 +171,8 @@ def addPixelDataClass(module, pd, img, bpp, doc=""): MethodDef(type=itrName, name='GetPixels', isConst=True), - CppMethodDef('int', '__nonzero__', '()', - body="""\ - return (int)self->operator bool(); - """), + CppMethodDef('int', '__nonzero__', '()', body="return (int)self->operator bool();"), + CppMethodDef('int', '__bool__', '()', body="return self->operator bool();"), ]) # add this class to the module @@ -200,10 +198,8 @@ def addPixelDataClass(module, pd, img, bpp, doc=""): MethodDef(type='bool', name='IsOk', isConst=True), - CppMethodDef('int', '__nonzero__', '()', - body="""\ - return (int)self->IsOk(); - """), + CppMethodDef('int', '__nonzero__', '()', body="return (int)self->IsOk();"), + CppMethodDef('int', '__bool__', '()', body="return self->IsOk();"), MethodDef(type='void', name='Offset', items=[ ParamDef(type='const %s&' % pd, name='data'), diff --git a/etg/richtextbuffer.py b/etg/richtextbuffer.py index 117702ee..50c7f615 100644 --- a/etg/richtextbuffer.py +++ b/etg/richtextbuffer.py @@ -110,11 +110,13 @@ def run(): assert isinstance(c, etgtools.ClassDef) c.find('SetValue').findOverload('units').ignore() c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();") + c.addCppMethod('int', '__bool__', '()', "return self->IsValid();") #------------------------------------------------------- c = module.find('wxTextAttrDimensions') tools.ignoreConstOverloads(c) c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();") + c.addCppMethod('int', '__bool__', '()', "return self->IsValid();") #------------------------------------------------------- c = module.find('wxTextAttrSize') @@ -122,17 +124,20 @@ def run(): c.find('SetWidth').findOverload('units').ignore() c.find('SetHeight').findOverload('units').ignore() c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();") + c.addCppMethod('int', '__bool__', '()', "return self->IsValid();") #------------------------------------------------------- c = module.find('wxTextAttrBorder') tools.ignoreConstOverloads(c) c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();") + c.addCppMethod('int', '__bool__', '()', "return self->IsValid();") #------------------------------------------------------- c = module.find('wxTextAttrBorders') tools.ignoreConstOverloads(c) c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();") + c.addCppMethod('int', '__bool__', '()', "return self->IsValid();") #------------------------------------------------------- @@ -161,6 +166,7 @@ def run(): c = module.find('wxRichTextSelection') tools.ignoreConstOverloads(c) c.addCppMethod('int', '__nonzero__', '()', "return self->IsValid();") + c.addCppMethod('int', '__bool__', '()', "return self->IsValid();") c.find('operator[]').ignore() @@ -185,6 +191,7 @@ def run(): c.addPyMethod('__repr__', '(self)', 'return "RichTextRange"+str(self.Get())') c.addPyMethod('__len__', '(self)', 'return len(self.Get())') c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)') + c.addPyMethod('__bool__', '(self)', 'return self.Get() != (0,0)') c.addPyMethod('__reduce__', '(self)', 'return (RichTextRange, self.Get())') c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]') c.addPyMethod('__setitem__', '(self, idx, val)', diff --git a/etg/sound.py b/etg/sound.py index 33ddc24d..e43d269f 100644 --- a/etg/sound.py +++ b/etg/sound.py @@ -61,9 +61,8 @@ def run(): c.find('wxSound.isResource').ignore() c.find('Create.isResource').ignore() - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.find('Play').renameOverload('filename', 'PlaySound') c.find('IsPlaying').ignore() diff --git a/etg/treectrl.py b/etg/treectrl.py index d5639492..4a06f97a 100644 --- a/etg/treectrl.py +++ b/etg/treectrl.py @@ -47,9 +47,8 @@ def run(): c.find('wxTreeItemId').overloads.append(ctor) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('bool', '__eq__', '(const wxTreeItemId& other)', """\ return *self == *other; diff --git a/etg/treelist.py b/etg/treelist.py index 35e28e32..b92805e1 100644 --- a/etg/treelist.py +++ b/etg/treelist.py @@ -43,9 +43,8 @@ def run(): c = module.find('wxTreeListItem') assert isinstance(c, etgtools.ClassDef) - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") c.addCppMethod('long', '__hash__', '()', """\ return (long)self->GetID(); diff --git a/etg/vidmode.py b/etg/vidmode.py index a1667be8..e6138b9d 100644 --- a/etg/vidmode.py +++ b/etg/vidmode.py @@ -32,9 +32,8 @@ def run(): c = module.find('wxVideoMode') - c.addCppMethod('int', '__nonzero__', '()', """\ - return self->IsOk(); - """) + c.addCppMethod('int', '__nonzero__', '()', "return self->IsOk();") + c.addCppMethod('int', '__bool__', '()', "return self->IsOk();") module.addItem(tools.wxArrayWrapperTemplate( 'wxArrayVideoModes', 'wxVideoMode', module))