Skip to content

Commit e744d97

Browse files
refactor: None checks anti patterns
1 parent d0f67be commit e744d97

11 files changed

Lines changed: 19 additions & 19 deletions

File tree

apps/dumbPaintTool/dumbPaintTool/app/palette.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ def _getPos(col):
9494
return None
9595
pw, ph = len(self._palette[0]),len(self._palette)
9696
if fg!=ttk.TTkColor.RST:
97-
if (pos:=_getPos(fg)) != None:
97+
if (pos:=_getPos(fg)) is not None:
9898
self._fg = pos
9999
else:
100100
self._fg = (pw-2,ph-1)
101101
self._palette[ph-1][pw-2] = (fg,fg.invertFgBg())
102102

103103
if bg!=ttk.TTkColor.RST:
104-
if (pos:=_getPos(bg)) != None:
104+
if (pos:=_getPos(bg)) is not None:
105105
self._bg = pos
106106
else:
107107
self._bg = (pw-1,ph-1)

apps/ttkDesigner/ttkDesigner/app/superobj/superlayoutgrid.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def _processMouseOver(self, x, y):
254254
# iy, ih = verSizes[row]
255255

256256
wid = self.layout().itemAtPosition(row,col)
257-
if wid == None:
257+
if wid is None:
258258
return dir,pos,wid,placesSpan
259259

260260
col = wid._col
@@ -336,7 +336,7 @@ def _processDragOver(self, x, y):
336336
dr = ix+iw-x-1
337337
dmin = min(dt,db,dl,dr)
338338

339-
if self.layout().itemAtPosition(row,col) == None:
339+
if self.layout().itemAtPosition(row,col) is None:
340340
ret = (ix, iy, iw, ih)
341341
else:
342342
#Top - we are closer to this edge

libs/pyTermTk/TermTk/TTkCore/filebuffer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def getLine(self, line):
101101
return ""
102102
page = line//self._window
103103
offset = line%self._window
104-
if self._pages[page] == None:
104+
if self._pages[page]is None:
105105
# Dispose of the pages to the bottom
106106
dispose = self._buffer.pop(0)
107107
if dispose is not None:

libs/pyTermTk/TermTk/TTkCore/string.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ def completeColor(self, color:TTkColor, match=None, posFrom=None, posTo=None) ->
485485
start = pos+lenMatch
486486
for i in range(pos, pos+lenMatch):
487487
ret._colors[i] |= color
488-
elif posFrom == posTo == None:
488+
elif posFrom is posTo is None:
489489
ret._colors = [c|color for c in self._colors]
490490
elif posFrom < posTo:
491491
ret._colors = self._colors.copy()
@@ -523,7 +523,7 @@ def setColor(self, color, match=None, posFrom=None, posTo=None) -> TTkString:
523523
while None != (pos := self._text.index(match, start) if match in self._text[start:] else None):
524524
start = pos+lenMatch
525525
ret._colors[pos: pos+lenMatch] = [color]*lenMatch
526-
elif posFrom == posTo == None:
526+
elif posFrom is posTo is None:
527527
ret._colors = [color]*len(self._text)
528528
elif posFrom < posTo:
529529
ret._colors += self._colors

libs/pyTermTk/TermTk/TTkGui/clipboard.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def text():
137137
TTkLog.error("Clipboard error, try to export X11 if you are running this UI via SSH")
138138
for line in str(e).split("\n"):
139139
TTkLog.error(line)
140-
if txt == None or txt == str(TTkClipboard._clipboard):
140+
if txt is None or txt == str(TTkClipboard._clipboard):
141141
return TTkClipboard._clipboard
142142
return txt
143143
return TTkClipboard._clipboard

libs/pyTermTk/TermTk/TTkWidgets/apptemplate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def setWidget(self,
236236
self.layout().addWidget(widget)
237237
if border!=None:
238238
self._panels[position].border = border
239-
if fixed != None:
239+
if fixed is not None:
240240
self._panels[position].fixed = fixed
241241
self._panels[position].title = TTkString(title)
242242
self._panels[position].size = ( size if size is not None else
@@ -277,7 +277,7 @@ def setItem(self,
277277
self.layout().addItem(item)
278278
if border!=None:
279279
self._panels[position].border = border
280-
if fixed != None:
280+
if fixed is not None:
281281
self._panels[position].fixed = fixed
282282
self._panels[position].title = TTkString(title)
283283
self._panels[position].size = ( size if size is not None else

libs/pyTermTk/TermTk/TTkWidgets/checkbox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def __init__(self, *,
117117

118118
self._text = TTkString(text)
119119

120-
if checkStatus != None :
120+
if checkStatus is not None :
121121
self._checkStatus = checkStatus
122122
else:
123123
self._checkStatus = TTkK.Checked if checked else TTkK.Unchecked

libs/pyTermTk/TermTk/TTkWidgets/radiobutton.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def __init__(self, *,
9595
self._radiogroup = radiogroup
9696
# self.checked = pyTTkSignal()
9797
self._checked = checked
98-
if checkStatus != None :
98+
if checkStatus is not None :
9999
self._checked = checkStatus==TTkK.Checked
100100
else:
101101
self._checked = checked
@@ -190,7 +190,7 @@ def paintEvent(self, canvas):
190190
def _checkEvent(self):
191191
# Uncheck the radio already checked;
192192
for radio in TTkRadioButton._radioLists[self._radiogroup]:
193-
if self != radio != None:
193+
if self != radio is not None:
194194
if radio.isChecked():
195195
radio.setCheckState(TTkK.Unchecked)
196196
self._checked = True

tests/pytest/modelView/test_tablemodellist.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_init_default(self):
4949

5050
assert model.rowCount() == 0
5151
assert model.columnCount() == 0
52-
assert model.data(0, 0) == None
52+
assert model.data(0, 0) is None
5353

5454
def test_init_with_data(self):
5555
"""Test initialization with data"""
@@ -298,7 +298,7 @@ def test_remove_rows_boundary_conditions(self):
298298
assert model.data(0, 0) == 'Alice'
299299
assert model.data(1, 0) == 'Bob'
300300
# Charlie should be gone
301-
assert model.data(2, 0) == None
301+
assert model.data(2, 0) is None
302302

303303
# Reset for next test
304304
model = ttk.TTkTableModelList(data=[row[:] for row in self.test_data])
@@ -344,7 +344,7 @@ def test_remove_columns_boundary_conditions(self):
344344
assert model.columnCount() == original_column_count - 1
345345
assert model.data(0, 0) == 'Alice' # Name still there
346346
assert model.data(0, 1) == 25 # Age still there
347-
assert model.data(0, 2) == None # Role should be gone
347+
assert model.data(0, 2) is None # Role should be gone
348348

349349
# Reset for next test
350350
model = ttk.TTkTableModelList(data=[row[:] for row in self.test_data])
@@ -362,7 +362,7 @@ def test_remove_columns_boundary_conditions(self):
362362
# Should remove columns 1 and 2 (Age and Role), leaving only Name
363363
assert model.columnCount() == 1
364364
assert model.data(0, 0) == 'Alice'
365-
assert model.data(0, 1) == None # Age should be gone
365+
assert model.data(0, 1) is None # Age should be gone
366366

367367
# Reset for next test
368368
model = ttk.TTkTableModelList(data=[row[:] for row in self.test_data])

tests/pytest/modelView/test_tablemodelsqlite3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ def test_empty_table_initialization(self):
773773
assert model.columnCount() == 2 # name, age (id is primary key)
774774

775775
# Test data access on empty table
776-
assert model.data(0, 0) == None or model.data(0, 0) is None
776+
assert model.data(0, 0) is None or model.data(0, 0) is None
777777

778778
# Test header data still works
779779
assert model.headerData(0, ttk.TTkK.HORIZONTAL) == 'name'

0 commit comments

Comments
 (0)