From e0e00904c4d1dda3c73907818779d55fe78f449d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
<27212526+echoix@users.noreply.github.com>
Date: Sat, 28 Sep 2024 12:50:49 +0000
Subject: [PATCH 1/2] style: Fix negate-equal-op (SIM201)
Ruff rule: https://docs.astral.sh/ruff/rules/negate-equal-op/
---
gui/wxpython/animation/dialogs.py | 2 +-
gui/wxpython/gcp/manager.py | 10 +++++-----
gui/wxpython/gcp/mapdisplay.py | 2 +-
gui/wxpython/gui_core/vselect.py | 2 +-
gui/wxpython/iclass/frame.py | 4 ++--
gui/wxpython/image2target/ii2t_manager.py | 6 +++---
gui/wxpython/image2target/ii2t_mapdisplay.py | 2 +-
gui/wxpython/iscatt/plots.py | 10 +++++-----
gui/wxpython/mapdisp/frame.py | 6 +++---
gui/wxpython/nviz/mapwindow.py | 4 ++--
gui/wxpython/nviz/wxnviz.py | 2 +-
gui/wxpython/photo2image/ip2i_manager.py | 6 +++---
gui/wxpython/photo2image/ip2i_mapdisplay.py | 2 +-
gui/wxpython/psmap/frame.py | 2 +-
gui/wxpython/rdigit/dialogs.py | 2 +-
gui/wxpython/vdigit/wxdigit.py | 4 ++--
gui/wxpython/vnet/widgets.py | 2 +-
lib/init/grass.py | 4 ++--
man/build_keywords.py | 2 +-
pyproject.toml | 1 -
python/grass/gunittest/case.py | 2 +-
python/grass/pygrass/modules/interface/parameter.py | 2 +-
python/grass/temporal/spatial_extent.py | 4 ++--
scripts/g.extension.all/g.extension.all.py | 2 +-
.../testsuite/test_r_semantic_label.py | 2 +-
utils/mkhtml.py | 2 +-
26 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/gui/wxpython/animation/dialogs.py b/gui/wxpython/animation/dialogs.py
index 3d70dbd2639..428abdb2626 100644
--- a/gui/wxpython/animation/dialogs.py
+++ b/gui/wxpython/animation/dialogs.py
@@ -1572,7 +1572,7 @@ def _export_file_validation(self, filebrowsebtn, file_path, file_postfix):
caption=_("Overwrite?"),
style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION,
)
- if not overwrite_dlg.ShowModal() == wx.ID_YES:
+ if overwrite_dlg.ShowModal() != wx.ID_YES:
overwrite_dlg.Destroy()
return False
overwrite_dlg.Destroy()
diff --git a/gui/wxpython/gcp/manager.py b/gui/wxpython/gcp/manager.py
index e5e0dd37471..45fc9b2b411 100644
--- a/gui/wxpython/gcp/manager.py
+++ b/gui/wxpython/gcp/manager.py
@@ -1810,7 +1810,7 @@ def OnGeorect(self, event):
overwrite=self.overwrite,
)
if overwrite_dlg:
- if not overwrite_dlg.ShowModal() == wx.ID_YES:
+ if overwrite_dlg.ShowModal() != wx.ID_YES:
overwrite_dlg.Destroy()
return
overwrite_dlg.Destroy()
@@ -1870,7 +1870,7 @@ def OnGeorect(self, event):
overwrite=self.overwrite,
)
if overwrite_dlg:
- if not overwrite_dlg.ShowModal() == wx.ID_YES:
+ if overwrite_dlg.ShowModal() != wx.ID_YES:
overwrite_dlg.Destroy()
return
overwrite_dlg.Destroy()
@@ -2300,7 +2300,7 @@ def AdjustMap(self, newreg):
def OnZoomToSource(self, event):
"""Set target map window to match extents of source map window"""
- if not self.MapWindow == self.TgtMapWindow:
+ if self.MapWindow != self.TgtMapWindow:
self.MapWindow = self.TgtMapWindow
self.Map = self.TgtMap
self.UpdateActive(self.TgtMapWindow)
@@ -2313,7 +2313,7 @@ def OnZoomToSource(self, event):
def OnZoomToTarget(self, event):
"""Set source map window to match extents of target map window"""
- if not self.MapWindow == self.SrcMapWindow:
+ if self.MapWindow != self.SrcMapWindow:
self.MapWindow = self.SrcMapWindow
self.Map = self.SrcMap
self.UpdateActive(self.SrcMapWindow)
@@ -3323,7 +3323,7 @@ def OnSrcSelection(self, event):
tmp_map = self.srcselection.GetValue()
- if not tmp_map == "" and not tmp_map == src_map:
+ if tmp_map != "" and tmp_map != src_map:
self.new_src_map = tmp_map
def OnTgtRastSelection(self, event):
diff --git a/gui/wxpython/gcp/mapdisplay.py b/gui/wxpython/gcp/mapdisplay.py
index 66daa70d2ca..0681b03e4e8 100644
--- a/gui/wxpython/gcp/mapdisplay.py
+++ b/gui/wxpython/gcp/mapdisplay.py
@@ -575,7 +575,7 @@ def GetMapToolbar(self):
return self.toolbars["gcpdisp"]
def _setActiveMapWindow(self, mapWindow):
- if not self.MapWindow == mapWindow:
+ if self.MapWindow != mapWindow:
self.MapWindow = mapWindow
self.Map = mapWindow.Map
self.UpdateActive(mapWindow)
diff --git a/gui/wxpython/gui_core/vselect.py b/gui/wxpython/gui_core/vselect.py
index 0ff30afaafd..16bb64b7a57 100644
--- a/gui/wxpython/gui_core/vselect.py
+++ b/gui/wxpython/gui_core/vselect.py
@@ -232,7 +232,7 @@ def AddVecInfo(self, vInfoDictTMP) -> bool:
if self._dialog:
self.slist.AddItem(vInfoDictTMP)
- return not len(self.selectedFeatures) == 0
+ return len(self.selectedFeatures) != 0
def _draw(self):
"""Call class 'VectorSelectHighlighter' to draw selected features"""
diff --git a/gui/wxpython/iclass/frame.py b/gui/wxpython/iclass/frame.py
index 69c18780249..606c364c76f 100644
--- a/gui/wxpython/iclass/frame.py
+++ b/gui/wxpython/iclass/frame.py
@@ -570,7 +570,7 @@ def OnZoomMenu(self, event):
def OnZoomToTraining(self, event):
"""Set preview display to match extents of training display"""
- if not self.MapWindow == self.GetSecondWindow():
+ if self.MapWindow != self.GetSecondWindow():
self.MapWindow = self.GetSecondWindow()
self.Map = self.GetSecondMap()
self.UpdateActive(self.GetSecondWindow())
@@ -583,7 +583,7 @@ def OnZoomToTraining(self, event):
def OnZoomToPreview(self, event):
"""Set preview display to match extents of training display"""
- if not self.MapWindow == self.GetFirstWindow():
+ if self.MapWindow != self.GetFirstWindow():
self.MapWindow = self.GetFirstWindow()
self.Map = self.GetFirstMap()
self.UpdateActive(self.GetFirstWindow())
diff --git a/gui/wxpython/image2target/ii2t_manager.py b/gui/wxpython/image2target/ii2t_manager.py
index 17811ceceb1..eb2dcdd6950 100644
--- a/gui/wxpython/image2target/ii2t_manager.py
+++ b/gui/wxpython/image2target/ii2t_manager.py
@@ -2245,7 +2245,7 @@ def AdjustMap(self, newreg):
def OnZoomToSource(self, event):
"""Set target map window to match extents of source map window"""
- if not self.MapWindow == self.TgtMapWindow:
+ if self.MapWindow != self.TgtMapWindow:
self.MapWindow = self.TgtMapWindow
self.Map = self.TgtMap
self.UpdateActive(self.TgtMapWindow)
@@ -2258,7 +2258,7 @@ def OnZoomToSource(self, event):
def OnZoomToTarget(self, event):
"""Set source map window to match extents of target map window"""
- if not self.MapWindow == self.SrcMapWindow:
+ if self.MapWindow != self.SrcMapWindow:
self.MapWindow = self.SrcMapWindow
self.Map = self.SrcMap
self.UpdateActive(self.SrcMapWindow)
@@ -3282,7 +3282,7 @@ def OnSrcSelection(self, event):
tmp_map = self.srcselection.GetValue()
- if not tmp_map == "" and not tmp_map == src_map:
+ if tmp_map != "" and tmp_map != src_map:
self.new_src_map = tmp_map
def OnTgtRastSelection(self, event):
diff --git a/gui/wxpython/image2target/ii2t_mapdisplay.py b/gui/wxpython/image2target/ii2t_mapdisplay.py
index b85a70a152f..c148eb314d2 100644
--- a/gui/wxpython/image2target/ii2t_mapdisplay.py
+++ b/gui/wxpython/image2target/ii2t_mapdisplay.py
@@ -567,7 +567,7 @@ def GetMapToolbar(self):
return self.toolbars["gcpdisp"]
def _setActiveMapWindow(self, mapWindow):
- if not self.MapWindow == mapWindow:
+ if self.MapWindow != mapWindow:
self.MapWindow = mapWindow
self.Map = mapWindow.Map
self.UpdateActive(mapWindow)
diff --git a/gui/wxpython/iscatt/plots.py b/gui/wxpython/iscatt/plots.py
index 08afe5906ed..32ce111c428 100644
--- a/gui/wxpython/iscatt/plots.py
+++ b/gui/wxpython/iscatt/plots.py
@@ -168,7 +168,7 @@ def SetEmpty(self):
return self.polygon_drawer.SetEmpty()
def OnRelease(self, event):
- if not self.mode == "zoom":
+ if self.mode != "zoom":
return
self.zoom_rect.set_visible(False)
self.ZoomRectangle(event)
@@ -348,7 +348,7 @@ def ZoomWheel(self, event):
def ZoomRectangle(self, event):
# get the current x and y limits
- if not self.mode == "zoom":
+ if self.mode != "zoom":
return
if event.inaxes is None:
return
@@ -394,7 +394,7 @@ def OnCanvasLeave(self, event):
def PanMotion(self, event):
"on mouse movement"
- if not self.mode == "pan":
+ if self.mode != "pan":
return
if event.inaxes is None:
return
@@ -426,7 +426,7 @@ def PanMotion(self, event):
self.canvas.draw()
def ZoomRectMotion(self, event):
- if not self.mode == "zoom":
+ if self.mode != "zoom":
return
if event.inaxes is None:
return
@@ -866,7 +866,7 @@ def _addVertex(self, event):
def motion_notify_callback(self, event):
"on mouse movement"
- if not self.mode == "move_vertex":
+ if self.mode != "move_vertex":
return
if not self.showverts:
return
diff --git a/gui/wxpython/mapdisp/frame.py b/gui/wxpython/mapdisp/frame.py
index 0b948f63794..f13ffbe0a81 100644
--- a/gui/wxpython/mapdisp/frame.py
+++ b/gui/wxpython/mapdisp/frame.py
@@ -831,7 +831,7 @@ def _DToRastDone():
overwrite=overwrite,
getErrorMsg=True,
)
- if not returncode == 0:
+ if returncode != 0:
self._giface.WriteError(_("Failed to run d.to.rast:\n") + messages)
return
# set region for composite
@@ -839,7 +839,7 @@ def _DToRastDone():
returncode, messages = RunCommand(
"g.region", raster=tmpName + ".red", quiet=True, getErrorMsg=True
)
- if not returncode == 0:
+ if returncode != 0:
gs.del_temp_region()
self._giface.WriteError(_("Failed to run d.to.rast:\n") + messages)
return
@@ -862,7 +862,7 @@ def _DToRastDone():
quiet=True,
name=[tmpName + ".red", tmpName + ".green", tmpName + ".blue"],
)
- if not returncode == 0:
+ if returncode != 0:
self._giface.WriteError(_("Failed to run d.to.rast:\n") + messages)
gs.try_remove(pngFile)
return
diff --git a/gui/wxpython/nviz/mapwindow.py b/gui/wxpython/nviz/mapwindow.py
index eaf0d266d4e..550939da7ce 100644
--- a/gui/wxpython/nviz/mapwindow.py
+++ b/gui/wxpython/nviz/mapwindow.py
@@ -534,7 +534,7 @@ def OnKeyDown(self, event):
Used for fly-through mode.
"""
- if not self.mouse["use"] == "fly":
+ if self.mouse["use"] != "fly":
return
key = event.GetKeyCode()
@@ -596,7 +596,7 @@ def OnKeyUp(self, event):
Used for fly-through mode.
"""
- if not self.mouse["use"] == "fly":
+ if self.mouse["use"] != "fly":
return
key = event.GetKeyCode()
diff --git a/gui/wxpython/nviz/wxnviz.py b/gui/wxpython/nviz/wxnviz.py
index 8002d6f32d2..e80a9fc9382 100644
--- a/gui/wxpython/nviz/wxnviz.py
+++ b/gui/wxpython/nviz/wxnviz.py
@@ -83,7 +83,7 @@ def print_progress(value):
"""Redirect progress info"""
global progress
if progress:
- if not progress.GetRange() == 100:
+ if progress.GetRange() != 100:
progress.SetRange(100)
progress.SetValue(value)
else:
diff --git a/gui/wxpython/photo2image/ip2i_manager.py b/gui/wxpython/photo2image/ip2i_manager.py
index f251a1fa36e..135eb96b032 100644
--- a/gui/wxpython/photo2image/ip2i_manager.py
+++ b/gui/wxpython/photo2image/ip2i_manager.py
@@ -1531,7 +1531,7 @@ def AdjustMap(self, newreg):
def OnZoomToSource(self, event):
"""Set target map window to match extents of source map window"""
- if not self.MapWindow == self.TgtMapWindow:
+ if self.MapWindow != self.TgtMapWindow:
self.MapWindow = self.TgtMapWindow
self.Map = self.TgtMap
self.UpdateActive(self.TgtMapWindow)
@@ -1544,7 +1544,7 @@ def OnZoomToSource(self, event):
def OnZoomToTarget(self, event):
"""Set source map window to match extents of target map window"""
- if not self.MapWindow == self.SrcMapWindow:
+ if self.MapWindow != self.SrcMapWindow:
self.MapWindow = self.SrcMapWindow
self.Map = self.SrcMap
self.UpdateActive(self.SrcMapWindow)
@@ -2381,7 +2381,7 @@ def OnSrcSelection(self, event):
tmp_map = self.srcselection.GetValue()
- if not tmp_map == "" and not tmp_map == src_map:
+ if tmp_map != "" and tmp_map != src_map:
self.new_src_map = tmp_map
def OnTgtRastSelection(self, event):
diff --git a/gui/wxpython/photo2image/ip2i_mapdisplay.py b/gui/wxpython/photo2image/ip2i_mapdisplay.py
index f85be35ec4a..aa085f2b43a 100644
--- a/gui/wxpython/photo2image/ip2i_mapdisplay.py
+++ b/gui/wxpython/photo2image/ip2i_mapdisplay.py
@@ -559,7 +559,7 @@ def GetMapToolbar(self):
return self.toolbars["gcpdisp"]
def _setActiveMapWindow(self, mapWindow):
- if not self.MapWindow == mapWindow:
+ if self.MapWindow != mapWindow:
self.MapWindow = mapWindow
self.Map = mapWindow.Map
self.UpdateActive(mapWindow)
diff --git a/gui/wxpython/psmap/frame.py b/gui/wxpython/psmap/frame.py
index 3effc33cd4d..fa4a150aa3b 100644
--- a/gui/wxpython/psmap/frame.py
+++ b/gui/wxpython/psmap/frame.py
@@ -308,7 +308,7 @@ def OnPsMapDialog(self, event):
def OnPDFFile(self, event):
"""Generate PDF from PS with ps2pdf if available"""
- if not sys.platform == "win32":
+ if sys.platform != "win32":
try:
p = gs.Popen(["ps2pdf"], stderr=gs.PIPE)
p.stderr.close()
diff --git a/gui/wxpython/rdigit/dialogs.py b/gui/wxpython/rdigit/dialogs.py
index 650b75feb63..c632a84c0fe 100644
--- a/gui/wxpython/rdigit/dialogs.py
+++ b/gui/wxpython/rdigit/dialogs.py
@@ -114,7 +114,7 @@ def OnOK(self, event):
caption=_("Overwrite?"),
style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION,
)
- if not dlgOverwrite.ShowModal() == wx.ID_YES:
+ if dlgOverwrite.ShowModal() != wx.ID_YES:
dlgOverwrite.Destroy()
return
else:
diff --git a/gui/wxpython/vdigit/wxdigit.py b/gui/wxpython/vdigit/wxdigit.py
index ddcdc5a2755..154d5ab7c81 100644
--- a/gui/wxpython/vdigit/wxdigit.py
+++ b/gui/wxpython/vdigit/wxdigit.py
@@ -1084,7 +1084,7 @@ def EditLine(self, line, coords):
# apply snapping (node or vertex)
snap = self._getSnapMode()
if snap != NO_SNAP:
- modeSnap = not (snap == SNAP)
+ modeSnap = snap != SNAP
Vedit_snap_line(
self.poMapInfo,
self.popoBgMapInfo,
@@ -1889,7 +1889,7 @@ def _addFeature(self, ftype, coords, layer, cat, snap, threshold):
if snap != NO_SNAP:
# apply snapping (node or vertex)
- modeSnap = not (snap == SNAP)
+ modeSnap = snap != SNAP
Vedit_snap_line(
self.poMapInfo,
self.popoBgMapInfo,
diff --git a/gui/wxpython/vnet/widgets.py b/gui/wxpython/vnet/widgets.py
index 12477cc93ea..ed1f2aa514c 100644
--- a/gui/wxpython/vnet/widgets.py
+++ b/gui/wxpython/vnet/widgets.py
@@ -542,7 +542,7 @@ def IsShown(self, colName) -> bool:
:return: False - if is not shown
"""
- return not self._getColumnNum(colName) == -1
+ return self._getColumnNum(colName) != -1
class EditItem(wx.Dialog):
diff --git a/lib/init/grass.py b/lib/init/grass.py
index 40312471e44..f32f290d090 100755
--- a/lib/init/grass.py
+++ b/lib/init/grass.py
@@ -400,7 +400,7 @@ def create_grass_config_dir():
os.makedirs(directory)
except OSError as e:
# Can happen as a race condition
- if not e.errno == errno.EEXIST or not os.path.isdir(directory):
+ if e.errno != errno.EEXIST or not os.path.isdir(directory):
fatal(
_(
"Failed to create configuration directory '{}' with error: {}"
@@ -1631,7 +1631,7 @@ def sh_like_startup(location, location_name, grass_env_file, sh):
# save command history in mapset dir and remember more
# bash history file handled in specific_addition
- if not sh == "bash":
+ if sh != "bash":
os.environ["HISTFILE"] = os.path.join(location, sh_history)
# instead of changing $HOME, start bash with:
diff --git a/man/build_keywords.py b/man/build_keywords.py
index 6070fad1a28..b0dfe95e0e3 100644
--- a/man/build_keywords.py
+++ b/man/build_keywords.py
@@ -158,7 +158,7 @@ def get_module_man_html_file_path(module):
for k in sorted(char_list.keys()):
test_length += 1
# toc += '%s' % (char_list[k], k)
- if test_length % 4 == 0 and not test_length == all_keys:
+ if test_length % 4 == 0 and test_length != all_keys:
toc += '\n%s, ' % (char_list[k], k)
elif test_length % 4 == 0 and test_length == all_keys:
toc += '\n%s' % (char_list[k], k)
diff --git a/pyproject.toml b/pyproject.toml
index 649e309a73f..fa607b9a2b1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -256,7 +256,6 @@ ignore = [
"SIM114", # if-with-same-arms
"SIM116", # if-else-block-instead-of-dict-lookup
"SIM118", # in-dict-keys
- "SIM201", # negate-equal-op
"SIM223", # expr-and-false
"SIM401", # if-else-block-instead-of-dict-get
"SLF001", # private-member-access
diff --git a/python/grass/gunittest/case.py b/python/grass/gunittest/case.py
index da2c7486d16..b5563e47e9e 100644
--- a/python/grass/gunittest/case.py
+++ b/python/grass/gunittest/case.py
@@ -695,7 +695,7 @@ def assertFileMd5(self, filename, md5, text=False, msg=None):
actual = text_file_md5(filename)
else:
actual = file_md5(filename)
- if not actual == md5:
+ if actual != md5:
standardMsg = (
"File <{name}> does not have the right MD5 sum.\n"
"Expected is <{expected}>,"
diff --git a/python/grass/pygrass/modules/interface/parameter.py b/python/grass/pygrass/modules/interface/parameter.py
index 798efde56b7..3b58ea2b372 100644
--- a/python/grass/pygrass/modules/interface/parameter.py
+++ b/python/grass/pygrass/modules/interface/parameter.py
@@ -216,7 +216,7 @@ def __init__(self, xparameter=None, diz=None):
#
if "gisprompt" in diz and diz["gisprompt"]:
self.typedesc = diz["gisprompt"].get("prompt", "")
- self.input = not diz["gisprompt"]["age"] == "new"
+ self.input = diz["gisprompt"]["age"] != "new"
else:
self.input = True
diff --git a/python/grass/temporal/spatial_extent.py b/python/grass/temporal/spatial_extent.py
index 329a0a4a684..26498e0385e 100644
--- a/python/grass/temporal/spatial_extent.py
+++ b/python/grass/temporal/spatial_extent.py
@@ -875,7 +875,7 @@ def cover_2d(self, extent) -> bool:
if eS > S and eS < N:
edge_count += 1
- return not edge_count == 0
+ return edge_count != 0
def cover(self, extent) -> bool:
"""Return True if this extent covers the provided spatial
@@ -956,7 +956,7 @@ def cover(self, extent) -> bool:
if eB > B and eB < T:
edge_count += 1
- return not edge_count == 0
+ return edge_count != 0
def covered_2d(self, extent):
"""Return True if this extent is covered by the provided spatial
diff --git a/scripts/g.extension.all/g.extension.all.py b/scripts/g.extension.all/g.extension.all.py
index 7f0b36f4dc6..43d50073178 100644
--- a/scripts/g.extension.all/g.extension.all.py
+++ b/scripts/g.extension.all/g.extension.all.py
@@ -104,7 +104,7 @@ def download_modules_xml_file(url, response_format, *args, **kwargs):
try:
response = urlopen(url, *args, **kwargs)
- if not response.code == 200:
+ if response.code != 200:
index = HTTP_STATUS_CODES.index(response.code)
desc = HTTP_STATUS_CODES[index].description
gs.fatal(
diff --git a/scripts/r.semantic.label/testsuite/test_r_semantic_label.py b/scripts/r.semantic.label/testsuite/test_r_semantic_label.py
index b7456e22633..990954dbb5f 100644
--- a/scripts/r.semantic.label/testsuite/test_r_semantic_label.py
+++ b/scripts/r.semantic.label/testsuite/test_r_semantic_label.py
@@ -27,7 +27,7 @@ def read_semantic_label(self):
return rast.info.semantic_label
def test_semantic_label_assign_not_current_mapset(self):
- if not self.mapset == "PERMANENT":
+ if self.mapset != "PERMANENT":
self.mapset.name = "PERMANENT"
a_map = self.mapset.glist(type="raster")[0]
module = SimpleModule(
diff --git a/utils/mkhtml.py b/utils/mkhtml.py
index d36ea78663d..54b2b80e87d 100644
--- a/utils/mkhtml.py
+++ b/utils/mkhtml.py
@@ -159,7 +159,7 @@ def download_git_commit(url, response_format, *args, **kwargs):
"""
try:
response = urlopen(url, *args, **kwargs)
- if not response.code == 200:
+ if response.code != 200:
index = HTTP_STATUS_CODES.index(response.code)
desc = HTTP_STATUS_CODES[index].description
gs.fatal(
From f5d18fcafb7dd25754a32d8b2412fa8e5385f562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
<27212526+echoix@users.noreply.github.com>
Date: Sat, 28 Sep 2024 12:54:36 +0000
Subject: [PATCH 2/2] style: Fix repeated-equality-comparison (PLR1714) on
changed code
---
gui/wxpython/gcp/manager.py | 2 +-
gui/wxpython/image2target/ii2t_manager.py | 2 +-
gui/wxpython/photo2image/ip2i_manager.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gui/wxpython/gcp/manager.py b/gui/wxpython/gcp/manager.py
index 45fc9b2b411..a96555fe271 100644
--- a/gui/wxpython/gcp/manager.py
+++ b/gui/wxpython/gcp/manager.py
@@ -3323,7 +3323,7 @@ def OnSrcSelection(self, event):
tmp_map = self.srcselection.GetValue()
- if tmp_map != "" and tmp_map != src_map:
+ if tmp_map not in ("", src_map):
self.new_src_map = tmp_map
def OnTgtRastSelection(self, event):
diff --git a/gui/wxpython/image2target/ii2t_manager.py b/gui/wxpython/image2target/ii2t_manager.py
index eb2dcdd6950..1c9958c9cef 100644
--- a/gui/wxpython/image2target/ii2t_manager.py
+++ b/gui/wxpython/image2target/ii2t_manager.py
@@ -3282,7 +3282,7 @@ def OnSrcSelection(self, event):
tmp_map = self.srcselection.GetValue()
- if tmp_map != "" and tmp_map != src_map:
+ if tmp_map not in ("", src_map):
self.new_src_map = tmp_map
def OnTgtRastSelection(self, event):
diff --git a/gui/wxpython/photo2image/ip2i_manager.py b/gui/wxpython/photo2image/ip2i_manager.py
index 135eb96b032..e27e763fb2a 100644
--- a/gui/wxpython/photo2image/ip2i_manager.py
+++ b/gui/wxpython/photo2image/ip2i_manager.py
@@ -2381,7 +2381,7 @@ def OnSrcSelection(self, event):
tmp_map = self.srcselection.GetValue()
- if tmp_map != "" and tmp_map != src_map:
+ if tmp_map not in ("", src_map):
self.new_src_map = tmp_map
def OnTgtRastSelection(self, event):