style: Fix self-assigning-variable (PLW0127) (OSGeo#4137)

* style: Fix self-assigning-variable (PLW0127)

* PLW0127: python/grass/temporal/core.py: The last change on this line was removing decode(mapset) for python 3.

* temporal/t.rast.accumulate/t.rast.accumulate.py:283:13: PLW0127 Self-assignment of variable `upper`
Following the patterns from the same file, it seems that it is the map id that is wanted

* temporal/t.rast.accdetect/t.rast.accdetect.py:241:13: PLW0127 Self-assignment of variable `indicator`

Usage seemed to mean to set the map id instead.

* gui/wxpython/psmap/instructions.py: PLW0127 Self-assignment of variables in EstimateWidth, EstimateHeight, and EstimateSize

* gui/wxpython/psmap/frame.py:2234:17: PLW0127 Self-assignment of variable `zoomFactor`

* Change `not` usage to `<=`

* gui/wxpython/animation/temporal_manager.py:292:21: PLW0127 Self-assignment of variable `end`
Removed assignment

* Apply ruff suggestion for collapsible-else-if (PLR5501)

gui/wxpython/animation/temporal_manager.py

@@ -288,26 +288,23 @@ def _getLabelsAndMaps(self, timeseries):
                     followsPoint = True
                     lastTimeseries = series
                     end = None
-                else:
-                    end = end
-                    # interval data
-                    if series:
-                        # map exists, stop point mode
-                        listOfMaps.append(series)
-                        afterPoint = False
-                    elif afterPoint:
-                        # check point mode
-                        if followsPoint:
-                            # skip this one, already there
-                            followsPoint = False
-                            continue
-                        else:
-                            # append the last one (of point time)
-                            listOfMaps.append(lastTimeseries)
-                            end = None
+                elif series:
+                    # map exists, stop point mode
+                    listOfMaps.append(series)
+                    afterPoint = False
+                elif afterPoint:
+                    # check point mode
+                    if followsPoint:
+                        # skip this one, already there
+                        followsPoint = False
+                        continue
                     else:
-                        # append series which is None
-                        listOfMaps.append(series)
+                        # append the last one (of point time)
+                        listOfMaps.append(lastTimeseries)
+                        end = None
+                else:
+                    # append series which is None
+                    listOfMaps.append(series)
                 timeLabels.append((start, end, unit))
 
         return timeLabels, listOfMaps

gui/wxpython/psmap/frame.py

@@ -2230,9 +2230,7 @@ def ComputeZoom(self, rect):
                 zoomFactor = 1
             # when zooming to full extent, in some cases, there was zoom
             # 1.01..., which causes problem
-            if abs(zoomFactor - 1) > 0.01:
-                zoomFactor = zoomFactor
-            else:
+            if abs(zoomFactor - 1) <= 0.01:
                 zoomFactor = 1.0
 
             if self.mouse["use"] == "zoomout":

gui/wxpython/psmap/instructions.py

@@ -1733,17 +1733,13 @@ def Read(self, instruction, text, **kwargs):
     def EstimateHeight(self, raster, discrete, fontsize, cols=None, height=None):
         """Estimate height to draw raster legend"""
         if discrete == "n":
-            if height:
-                height = height
-            else:
+            if not height:
                 height = self.unitConv.convert(
                     value=fontsize * 10, fromUnit="point", toUnit="inch"
                 )
 
         if discrete == "y":
-            if cols:
-                cols = cols
-            else:
+            if not cols:
                 cols = 1
 
             rinfo = gs.raster_info(raster)
@@ -1772,9 +1768,7 @@ def EstimateWidth(
         if discrete == "n":
             rinfo = gs.raster_info(raster)
             minim, maxim = rinfo["min"], rinfo["max"]
-            if width:
-                width = width
-            else:
+            if not width:
                 width = self.unitConv.convert(
                     value=fontsize * 2, fromUnit="point", toUnit="inch"
                 )
@@ -1785,14 +1779,10 @@ def EstimateWidth(
             width += textPart
 
         elif discrete == "y":
-            if cols:
-                cols = cols
-            else:
+            if not cols:
                 cols = 1
 
-            if width:
-                width = width
-            else:
+            if not width:
                 paperWidth = (
                     paperInstr["Width"] - paperInstr["Right"] - paperInstr["Left"]
                 )
@@ -1872,14 +1862,10 @@ def Read(self, instruction, text, **kwargs):
 
     def EstimateSize(self, vectorInstr, fontsize, width=None, cols=None):
         """Estimate size to draw vector legend"""
-        if width:
-            width = width
-        else:
+        if not width:
             width = fontsize / 24.0
 
-        if cols:
-            cols = cols
-        else:
+        if not cols:
             cols = 1
 
         vectors = vectorInstr["list"]

pyproject.toml

@@ -183,7 +183,6 @@ ignore = [
     "PLR6104", # non-augmented-assignment
     "PLR6201", # literal-membership
     "PLR6301", # no-self-use
-    "PLW0127", # self-assigning-variable
     "PLW0406", # import-self
     "PLW0602", # global-variable-not-assigned
     "PLW0603", # global-statement

python/grass/temporal/core.py

@@ -479,7 +479,6 @@ def get_available_temporal_mapsets():
     tgis_mapsets = {}
 
     for mapset in mapsets:
-        mapset = mapset
         driver = c_library_interface.get_driver_name(mapset)
         database = c_library_interface.get_database_name(mapset)
 

temporal/t.rast.accdetect/t.rast.accdetect.py

@@ -238,7 +238,7 @@ def main():
                 )
             )
         if indicator.find("@") >= 0:
-            indicator = indicator
+            indicator_id = indicator
         else:
             indicator_id = indicator + "@" + mapset
 

temporal/t.rast.accumulate/t.rast.accumulate.py

@@ -272,7 +272,7 @@ def main():
             )
 
         if upper.find("@") >= 0:
-            upper = upper
+            upper_id = upper
         else:
             upper_id = upper + "@" + mapset