style: Fix implicit-return-value (RET502) & unnecessary-return-none (RET501)

gui/wxpython/animation/nviztask.py

@@ -299,7 +299,7 @@ def GetCommandSeries(self, layerList, paramName):
 
         if len(layerList) > 1:
             raise GException(_("Please add only one layer in the list."))
-            return
+            return None
         layer = layerList[0]
         if hasattr(layer, "maps"):
             series = layer.maps

gui/wxpython/core/gcmd.py

@@ -581,7 +581,7 @@ def __del__(self):
     def run(self):
         """Run command"""
         if len(self.cmd) == 0:
-            return
+            return None
 
         Debug.msg(1, "gcmd.CommandThread(): %s" % " ".join(self.cmd))
 

gui/wxpython/core/giface.py

@@ -333,7 +333,7 @@ def GetLayerTree(self):
 
     def GetMapDisplay(self):
         """Get current map display."""
-        return None
+        return
 
     def GetAllMapDisplays(self):
         """Get list of all map displays."""

gui/wxpython/core/settings.py

@@ -990,7 +990,7 @@ def SaveToFile(self, settings=None):
                 os.mkdir(dirPath)
             except OSError:
                 GError(_("Unable to create settings directory"))
-                return
+                return None
         try:
             with open(self.filePath, "w") as f:
                 json.dump(settings, f, indent=2, cls=SettingsJSONEncoder)

gui/wxpython/dbmgr/base.py

@@ -202,7 +202,7 @@ def LoadData(self, layer, columns=None, where=None, sql=None):
                         )
                         % {"column": col, "table": tableName},
                     )
-                    return
+                    return None
 
         try:
             # for maps connected via v.external

gui/wxpython/gcp/manager.py

@@ -2109,7 +2109,7 @@ def GetNewExtent(self, region, map=None):
 
         if not self.CheckGCPcount(msg=True):
             self.gr_order = order
-            return
+            return None
 
         self.gr_order = order
 
@@ -2152,7 +2152,7 @@ def GetNewExtent(self, region, map=None):
                     "Could not calculate new extends.\nPossible error with m.transform."
                 ),
             )
-            return
+            return None
 
         # fist corner
         e, n = errlist[0].split()
@@ -2492,7 +2492,7 @@ def AddGCPItem(self):
     def DeleteGCPItem(self):
         """Deletes selected item in GCP list."""
         if self.selected == wx.NOT_FOUND:
-            return
+            return None
 
         key = self.GetItemData(self.selected)
         self.DeleteItem(self.selected)

gui/wxpython/gmodeler/dialogs.py

@@ -132,7 +132,7 @@ def _layout(self):
     def GetType(self):
         """Get element type"""
         if not self.etype:
-            return
+            return None
         return self.element.tcp.GetType()
 
     def OnType(self, event):

gui/wxpython/gui_core/dialogs.py

@@ -492,7 +492,7 @@ def CreateNewVector(
             % outmap,
         )
         dlg.Destroy()
-        return
+        return None
 
     if outmap == "":  # should not happen
         dlg.Destroy()

gui/wxpython/gui_core/gselect.py

@@ -2086,7 +2086,7 @@ def GetDsn(self):
                 )
                 if not ret:
                     GError(parent=self, message=message)
-                    return
+                    return None
 
                 connection_string = None
                 for conn in ret.splitlines():
@@ -2107,7 +2107,7 @@ def GetDsn(self):
                         return connection_string
                 if not connection_string:
                     GError(parent=self, message=message)
-                    return
+                    return None
             else:
                 name = self._getCurrentDbWidgetName()
                 if name == "choice":

gui/wxpython/gui_core/toolbars.py

@@ -363,7 +363,7 @@ def __init__(
 
     def _toolbarData(self):
         """Toolbar data (virtual)"""
-        return None
+        return
 
     def Enable(self, tool, enable=True):
         """@copydoc ToolbarController::Enable()"""
@@ -411,7 +411,7 @@ def __init__(
 
     def _toolbarData(self):
         """Toolbar data (virtual)"""
-        return None
+        return
 
     def Enable(self, tool, enable=True):
         """@copydoc ToolbarController::Enable()"""

gui/wxpython/iclass/frame.py

@@ -687,7 +687,7 @@ def ImportAreas(self, vector):
         warning = self._checkImportedTopo(vector)
         if warning:
             GMessage(parent=self, message=warning)
-            return
+            return None
 
         wx.BeginBusyCursor()
         wx.GetApp().Yield()
@@ -698,7 +698,7 @@ def ImportAreas(self, vector):
         # open vector map to be imported
         if digitClass.OpenMap(vector, update=False) is None:
             GError(parent=self, message=_("Unable to open vector map <%s>") % vector)
-            return
+            return None
 
         # copy features to the temporary map
         vname = self._getTempVectorName()
@@ -709,7 +709,7 @@ def ImportAreas(self, vector):
                 parent=self,
                 message=_("Unable to copy vector features from <%s>") % vector,
             )
-            return
+            return None
         del os.environ["GRASS_VECTOR_TEMPORARY"]
 
         # close map
@@ -719,7 +719,7 @@ def ImportAreas(self, vector):
         self.poMapInfo = digitClass.OpenMap(vname, tmp=True)
         if self.poMapInfo is None:
             GError(parent=self, message=_("Unable to open temporary vector map"))
-            return
+            return None
 
         # remove temporary rasters
         for cat in self.stats_data.GetCategories():
@@ -1119,7 +1119,7 @@ def RunAnalysis(self):
         Signatures are created but signature file is not.
         """
         if not self.CheckInput(group=self.g["group"], vector=self.trainingAreaVector):
-            return
+            return None
 
         for statistic in self.cStatisticsDict.values():
             I_iclass_free_statistics(statistic)

gui/wxpython/image2target/ii2t_manager.py

@@ -2061,7 +2061,7 @@ def GetNewExtent(self, region, map=None):
 
         if not self.CheckGCPcount(msg=True):
             self.gr_order = order
-            return
+            return None
 
         self.gr_order = order
 
@@ -2103,7 +2103,7 @@ def GetNewExtent(self, region, map=None):
                     "Possible error with i.ortho.transform."
                 ),
             )
-            return
+            return None
 
         # fist corner
         e, n = errlist[0].split()
@@ -2449,7 +2449,7 @@ def AddGCPItem(self):
     def DeleteGCPItem(self):
         """Deletes selected item in GCP list."""
         if self.selected == wx.NOT_FOUND:
-            return
+            return None
 
         key = self.GetItemData(self.selected)
         self.DeleteItem(self.selected)

gui/wxpython/iscatt/plots.py

@@ -154,7 +154,7 @@ def _deactivateMode(self):
     def GetCoords(self):
         coords = self.polygon_drawer.GetCoords()
         if coords is None:
-            return
+            return None
 
         if self.transpose:
             for c in coords:

gui/wxpython/lmgr/frame.py

@@ -1229,7 +1229,7 @@ def OnRunScript(self, event):
                 message=_("Script file '%s' doesn't exist. Operation canceled.")
                 % filename,
             )
-            return
+            return None
 
         # check permission
         if not os.access(filename, os.X_OK):
@@ -1246,14 +1246,14 @@ def OnRunScript(self, event):
                 style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION,
             )
             if dlg.ShowModal() != wx.ID_YES:
-                return
+                return None
             dlg.Destroy()
             try:
                 mode = stat.S_IMODE(os.lstat(filename)[stat.ST_MODE])
                 os.chmod(filename, mode | stat.S_IXUSR)
             except OSError:
                 GError(_("Unable to set permission. Operation canceled."), parent=self)
-                return
+                return None
 
         # check GRASS_ADDON_PATH
         addonPath = os.getenv("GRASS_ADDON_PATH", [])

gui/wxpython/lmgr/layertree.py

@@ -1462,7 +1462,7 @@ def AddLayer(
                 if self.GetLayerInfo(item, key="type") == "vector":
                     name = self.GetLayerInfo(item, key="maplayer").GetName()
                     if name == lname:
-                        return
+                        return None
                 item = self.GetNextItem(item)
 
         selectedLayer = self.GetSelectedLayer()

gui/wxpython/location_wizard/wizard.py

@@ -1662,7 +1662,7 @@ def OnPageChanging(self, event: WizardEvent):
         if event.GetDirection():
             if not self.epsgcode:
                 event.Veto()
-                return
+                return None
             # check for datum transforms
             ret = RunCommand(
                 "g.proj", read=True, epsg=self.epsgcode, datum_trans="-1", flags="t"
@@ -1882,7 +1882,7 @@ def OnPageChanging(self, event: WizardEvent):
         if event.GetDirection():
             if not self.epsgcode:
                 event.Veto()
-                return
+                return None
             # check for datum transforms
             ret = RunCommand(
                 "g.proj",
@@ -2089,7 +2089,7 @@ def OnPageChanging(self, event: WizardEvent):
 
             if self.customstring.find("+datum=") < 0:
                 self.GetNext().SetPrev(self)
-                return
+                return None
 
             # check for datum transforms
             # FIXME: -t flag is a hack-around for trac bug #1849
@@ -2109,7 +2109,7 @@ def OnPageChanging(self, event: WizardEvent):
                     style=wx.OK | wx.ICON_ERROR | wx.CENTRE,
                 )
                 event.Veto()
-                return
+                return None
 
             if out:
                 dtrans = ""

gui/wxpython/main_window/frame.py

@@ -1384,7 +1384,7 @@ def OnRunScript(self, event):
                 message=_("Script file '%s' doesn't exist. Operation canceled.")
                 % filename,
             )
-            return
+            return None
 
         # check permission
         if not os.access(filename, os.X_OK):
@@ -1401,14 +1401,14 @@ def OnRunScript(self, event):
                 style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION,
             )
             if dlg.ShowModal() != wx.ID_YES:
-                return
+                return None
             dlg.Destroy()
             try:
                 mode = stat.S_IMODE(os.lstat(filename)[stat.ST_MODE])
                 os.chmod(filename, mode | stat.S_IXUSR)
             except OSError:
                 GError(_("Unable to set permission. Operation canceled."), parent=self)
-                return
+                return None
 
         # check GRASS_ADDON_PATH
         addonPath = os.getenv("GRASS_ADDON_PATH", [])

gui/wxpython/mapwin/buffered.py

@@ -378,7 +378,7 @@ def Draw(
             pdc.EndDrawing()
 
             self.Refresh()
-            return
+            return None
 
         if pdctype == "image":  # draw selected image
             bitmap = BitmapFromImage(img)
@@ -421,7 +421,7 @@ def Draw(
                 pdc.SetBrush(wx.Brush(wx.CYAN, wx.TRANSPARENT))
                 pdc.SetPen(pen)
                 if len(coords) < 2:
-                    return
+                    return None
                 if pdctype == "polyline":
                     i = 1
                     while i < len(coords):
@@ -497,7 +497,7 @@ def Draw(
 
         elif pdctype == "text":  # draw text on top of map
             if not img["active"]:
-                return  # only draw active text
+                return None  # only draw active text
             rotation = float(img["rotation"]) if "rotation" in img else 0.0
             w, h = self.GetFullTextExtent(img["text"])[0:2]
             pdc.SetFont(img["font"])

gui/wxpython/modules/colorrules.py

@@ -1838,7 +1838,7 @@ def _apply(self, updatePreview=True):
         else:
             if not self.properties["storeColumn"]:
                 GError(_("No color column defined. Operation canceled."), parent=self)
-                return
+                return None
 
             self.UseAttrColumn(True)
 

gui/wxpython/modules/extensions.py

@@ -185,7 +185,7 @@ def _getCmd(self):
         item = self.tree.GetSelected()
         if not item or "command" not in item[0].data:
             GError(_("Extension not defined"), parent=self)
-            return
+            return None
 
         name = item[0].data["command"]
 

gui/wxpython/nviz/mapwindow.py

@@ -1642,7 +1642,7 @@ def _loadRaster(self, item):
         layer = self.tree.GetLayerInfo(item, key="maplayer")
 
         if layer.type not in {"raster", "raster_3d"}:
-            return
+            return None
 
         if layer.type == "raster":
             id = self._display.LoadSurface(str(layer.name), None, None)
@@ -1826,7 +1826,7 @@ def LoadVector(self, item, points=None, append=True):
         """
         layer = self.tree.GetLayerInfo(item, key="maplayer")
         if layer.type != "vector":
-            return
+            return None
 
         # set default properties
         if points is None:

gui/wxpython/photo2image/ip2i_manager.py

@@ -1367,7 +1367,7 @@ def GetNewExtent(self, region, map=None):
 
         if not self.CheckGCPcount(msg=True):
             self.gr_order = order
-            return
+            return None
 
         self.gr_order = order
 
@@ -1410,7 +1410,7 @@ def GetNewExtent(self, region, map=None):
                     "Could not calculate new extends.\nPossible error with m.transform."
                 ),
             )
-            return
+            return None
 
         # fist corner
         e, n = errlist[0].split()
@@ -1751,7 +1751,7 @@ def AddGCPItem(self):
     def DeleteGCPItem(self):
         """Deletes selected item in GCP list."""
         if self.selected == wx.NOT_FOUND:
-            return
+            return None
 
         key = self.GetItemData(self.selected)
         self.DeleteItem(self.selected)