Fix warnings from PyCharm IDE about Python coding style

3liz · Mar 5, 2024 · a0a4a11 · a0a4a11
1 parent fe551b6
commit a0a4a11
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/cadastre/cadastre_export.py b/cadastre/cadastre_export.py
@@ -422,7 +422,8 @@ def replfunc(match):
             print("%s" % msg)
             return msg
 
-    def randomWord(self, length):
+    @staticmethod
+    def random_word(length: int) -> str:
         """
         Return a random string of given length
         """
@@ -437,8 +438,7 @@ def createComposition(self):
         # We need to set a name to the layout, otherwise, error when exporting
         # more than one time:
         # RuntimeError: wrapped C/C++ object of type QgsPrintLayout has been deleted
-        cName = self.randomWord(20)
-        c.setName(cName)
+        c.setName(self.random_word(20))
         c.initializeDefaults()
         c.setUnits(QgsUnitTypes.LayoutMillimeters)
 
@@ -505,15 +505,15 @@ def buildComposerLabel(self, key, item, page):
 
         # create HTML layout item
         # htmlItem = QgsLayoutItemHtml.create(self.currentComposition)
-        htmlItem = QgsLayoutItemHtml(self.currentComposition)
+        html_item = QgsLayoutItemHtml(self.currentComposition)
 
         # add frame to layout
-        self.currentComposition.addMultiFrame(htmlItem)
+        self.currentComposition.addMultiFrame(html_item)
 
         # create frame to show content from htmlItem
-        htmlItemFrame = QgsLayoutFrame(
+        html_item_frame = QgsLayoutFrame(
             self.currentComposition,
-            htmlItem
+            html_item
         )
         # htmlItemFrame.attemptSetSceneRect(
         #     QRectF(
@@ -525,20 +525,20 @@ def buildComposerLabel(self, key, item, page):
         # )
 
         # No border
-        htmlItemFrame.setFrameEnabled(False)
+        html_item_frame.setFrameEnabled(False)
 
         # set HTML contents
-        htmlItem.setContentMode(QgsLayoutItemHtml.ManualHtml)
+        html_item.setContentMode(QgsLayoutItemHtml.ManualHtml)
         content = self.getContentForGivenItem(
             key,
             item,
             page
         )
-        htmlItem.setHtml(content)
-        htmlItem.loadHtml()
+        html_item.setHtml(content)
+        html_item.loadHtml()
 
         # Reposition the frame
-        htmlItemFrame.attemptMove(
+        html_item_frame.attemptMove(
             QgsLayoutPoint(
                 item['position'][0],
                 item['position'][1] + (dpage) * (self.pageHeight + 10),
@@ -547,7 +547,7 @@ def buildComposerLabel(self, key, item, page):
         )
 
         # Set the correct size
-        htmlItemFrame.attemptResize(
+        html_item_frame.attemptResize(
             QgsLayoutSize(
                 item['position'][2],
                 item['position'][3],
@@ -556,7 +556,7 @@ def buildComposerLabel(self, key, item, page):
         )
 
         # Add frame to the HTML item
-        htmlItem.addFrame(htmlItemFrame)
+        html_item.addFrame(html_item_frame)
 
     def addParcelleMap(self):
         """