From 6faf213a76559a1ccd53a88d504a2333395c5c33 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 1 Jan 2014 04:23:33 +0000 Subject: [PATCH] Change all <> to != git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wx/lib/CDate.py | 2 +- wx/lib/analogclock/lib_setup/buttontreectrlpanel.py | 2 +- wx/lib/calendar.py | 2 +- wx/lib/floatcanvas/FloatCanvas.py | 2 +- wx/lib/pdfviewer/buttonpanel.py | 4 ++-- wx/lib/pdfviewer/dcgraphics.py | 4 ++-- wx/lib/pdfviewer/viewer.py | 4 ++-- wx/lib/ticker.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wx/lib/CDate.py b/wx/lib/CDate.py index 02ef8609..a375a991 100644 --- a/wx/lib/CDate.py +++ b/wx/lib/CDate.py @@ -36,7 +36,7 @@ def leapdays(y1, y2): # Return 1 for leap years, 0 for non-leap years def isleap(year): - return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0) + return year % 4 == 0 and (year % 100 != 0 or year % 400 == 0) def FillDate(val): s = str(val) diff --git a/wx/lib/analogclock/lib_setup/buttontreectrlpanel.py b/wx/lib/analogclock/lib_setup/buttontreectrlpanel.py index 3cbab5bd..0b1ba0ee 100644 --- a/wx/lib/analogclock/lib_setup/buttontreectrlpanel.py +++ b/wx/lib/analogclock/lib_setup/buttontreectrlpanel.py @@ -254,7 +254,7 @@ class ButtonTreeCtrlPanel(wx.Panel): self._doLogicTest(style, value, item) - if value <> data[0]: + if value != data[0]: nevt = ButtonTreeCtrlPanelEvent(obj=self, id=self.GetId(), item=item, val=value) wx.PostEvent(self, nevt) diff --git a/wx/lib/calendar.py b/wx/lib/calendar.py index 452aa570..89cd54df 100644 --- a/wx/lib/calendar.py +++ b/wx/lib/calendar.py @@ -829,7 +829,7 @@ class Calendar( wx.Control ): ts = newDate - curDate delta = ts.GetDays() - if delta <> None: + if delta != None: curDate = wx.DateTime.FromDMY(int(self.cal_days[self.sel_key]),self.month - 1,self.year) timeSpan = wx.TimeSpan.Days(delta) newDate = curDate + timeSpan diff --git a/wx/lib/floatcanvas/FloatCanvas.py b/wx/lib/floatcanvas/FloatCanvas.py index 9caf6f14..8424e05d 100644 --- a/wx/lib/floatcanvas/FloatCanvas.py +++ b/wx/lib/floatcanvas/FloatCanvas.py @@ -2515,7 +2515,7 @@ class ScaledBitmap2(TextObjectMixin, DrawObject, ): H = ScaleWorldToPixel(self.Height)[0] W = H * (self.bmpWidth / self.bmpHeight) if (self.ScaledBitmap is None) or (self.ScaledBitmap[0] != (0, 0, self.bmpWidth, self.bmpHeight, W, H) ): - #if True: #fixme: (self.ScaledBitmap is None) or (H <> self.ScaledHeight) : + #if True: #fixme: (self.ScaledBitmap is None) or (H != self.ScaledHeight) : self.ScaledHeight = H #print("Scaling to:", W, H) Img = self.Image.Scale(W, H) diff --git a/wx/lib/pdfviewer/buttonpanel.py b/wx/lib/pdfviewer/buttonpanel.py index 4bd77608..cc24192f 100644 --- a/wx/lib/pdfviewer/buttonpanel.py +++ b/wx/lib/pdfviewer/buttonpanel.py @@ -138,7 +138,7 @@ class pdfButtonPanel(bp.ButtonPanel): """ self.pageno = pagenum + 1 self.page.SetValue('%d' % self.pageno) - if numpages <> self.numpages: + if numpages != self.numpages: self.maxlabel.SetLabel('of %d' % numpages) self.numpages = numpages self.percentzoom = zoomscale * 100 @@ -197,7 +197,7 @@ class pdfButtonPanel(bp.ButtonPanel): try: newpage = int(self.page.GetValue()) if 1 <= newpage <= self.numpages: - if newpage <> self.pageno: + if newpage != self.pageno: self.pageno = newpage self.ChangePage() except ValueError: diff --git a/wx/lib/pdfviewer/dcgraphics.py b/wx/lib/pdfviewer/dcgraphics.py index 0c9175c1..d0e8b69b 100644 --- a/wx/lib/pdfviewer/dcgraphics.py +++ b/wx/lib/pdfviewer/dcgraphics.py @@ -221,7 +221,7 @@ class dcGraphicsContext(object): g = self.gstate a, b, c, d, e, f = map(float, matrix.Get()) g.Translate(e, f) - if d == a and c == -b and b <> 0: + if d == a and c == -b and b != 0: g.Rotate(a, b) else: g.Scale(a, d) @@ -390,7 +390,7 @@ class dcGraphicsPath(object): if parent: self.gstate = parent.gstate self.fillcolour = parent._context.GetBrush().GetColour() - self.isfilled = parent._context.GetBrush().GetStyle() <> wx.TRANSPARENT + self.isfilled = parent._context.GetBrush().GetStyle() != wx.TRANSPARENT def AddCurveToPoint(self, cx1, cy1, cx2, cy2, x, y): """ diff --git a/wx/lib/pdfviewer/viewer.py b/wx/lib/pdfviewer/viewer.py index 61d97064..20caf201 100644 --- a/wx/lib/pdfviewer/viewer.py +++ b/wx/lib/pdfviewer/viewer.py @@ -366,7 +366,7 @@ class pdfViewer(wx.ScrolledWindow): self.cur_frompage = self.frompage self.cur_topage = self.topage else: # page range unchanged? whole visible area will always be inside page buffer - if self.frompage <> self.cur_frompage or self.topage <> self.cur_topage: + if self.frompage != self.cur_frompage or self.topage != self.cur_topage: force = True # due to page buffer change self.cur_frompage = self.frompage self.cur_topage = self.topage @@ -1031,7 +1031,7 @@ def _AsciiBase85DecodePYTHON(input): # special rules apply if not a multiple of five bytes. whole_word_count, remainder_size = divmod(len(stripped), 5) #print('%d words, %d leftover' % (whole_word_count, remainder_size)) - #assert remainder_size <> 1, 'invalid Ascii 85 stream!' + #assert remainder_size != 1, 'invalid Ascii 85 stream!' cut = 5 * whole_word_count body, lastbit = stripped[0:cut], stripped[cut:] diff --git a/wx/lib/ticker.py b/wx/lib/ticker.py index 236c436a..e8b12ae1 100644 --- a/wx/lib/ticker.py +++ b/wx/lib/ticker.py @@ -106,7 +106,7 @@ class Ticker(wx.Control): def SetDirection(self, dir): """Sets the direction of the ticker: right to left(rtl) or left to right (ltr)""" if dir == "ltr" or dir == "rtl": - if self._offset <> 0: + if self._offset != 0: #Change the offset so it's correct for the new direction self._offset = self._extent[0] + self.GetSize()[0] - self._offset self._dir = dir