Minor sonarcloud fixes.

xlsxwriter/chart_bar.py

@@ -122,9 +122,8 @@ def _write_bar_chart(self, args):
             subtype = "percentStacked"
 
         # Set a default overlap for stacked charts.
-        if "stacked" in self.subtype:
-            if self.series_overlap_1 is None:
-                self.series_overlap_1 = 100
+        if "stacked" in self.subtype and self.series_overlap_1 is None:
+            self.series_overlap_1 = 100
 
         self._xml_start_tag("c:barChart")
 

xlsxwriter/chart_column.py

@@ -81,9 +81,8 @@ def _write_bar_chart(self, args):
             subtype = "percentStacked"
 
         # Set a default overlap for stacked charts.
-        if "stacked" in self.subtype:
-            if self.series_overlap_1 is None:
-                self.series_overlap_1 = 100
+        if "stacked" in self.subtype and self.series_overlap_1 is None:
+            self.series_overlap_1 = 100
 
         self._xml_start_tag("c:barChart")
 

xlsxwriter/drawing.py

@@ -376,11 +376,11 @@ def _write_a16_creation_id(self):
         # Write the <a16:creationId> element.
 
         xmlns_a_16 = "http://schemas.microsoft.com/office/drawing/2014/main"
-        id = "{00000000-0008-0000-0000-000002000000}"
+        creation_id = "{00000000-0008-0000-0000-000002000000}"
 
         attributes = [
             ("xmlns:a16", xmlns_a_16),
-            ("id", id),
+            ("id", creation_id),
         ]
 
         self._xml_empty_tag("a16:creationId", attributes)
@@ -709,11 +709,7 @@ def _write_sp_pr(self, col_absolute, row_absolute, width, height, shape=None):
 
     def _write_xdr_sp_pr(self, index, col_absolute, row_absolute, width, height, shape):
         # Write the <xdr:spPr> element for shapes.
-
-        attributes = []
-        # attributes = [('bwMode', 'auto')]
-
-        self._xml_start_tag("xdr:spPr", attributes)
+        self._xml_start_tag("xdr:spPr")
 
         # Write the a:xfrm element.
         self._write_a_xfrm(col_absolute, row_absolute, width, height, shape)

xlsxwriter/workbook.py

@@ -939,7 +939,6 @@ def _prepare_num_formats(self):
         unique_num_formats = {}
         num_formats = []
         index = 164
-        num_format_count = 0
 
         for xf_format in self.xf_formats + self.dxf_formats:
             num_format = xf_format.num_format
@@ -975,7 +974,6 @@ def _prepare_num_formats(self):
                 # Only increase font count for XF formats (not DXF formats).
                 if xf_format.xf_index:
                     num_formats.append(num_format)
-                    num_format_count += 1
 
         self.num_formats = num_formats
 

xlsxwriter/worksheet.py

@@ -2040,8 +2040,8 @@ def autofit(self):
                             length += 16
 
                     # Add the string length to the lookup table.
-                    max = col_width_max.get(col_num, 0)
-                    if length > max:
+                    width_max = col_width_max.get(col_num, 0)
+                    if length > width_max:
                         col_width_max[col_num] = length
 
         # Apply the width to the column.
@@ -2566,12 +2566,14 @@ def data_validation(self, first_row, first_col, last_row, last_col, options=None
             options["error_type"] = error_types[options["error_type"]]
 
         # Convert date/times value if required.
-        if options["validate"] in ("date", "time"):
-            if options["value"]:
-                if supported_datetime(options["value"]):
-                    date_time = self._convert_date_time(options["value"])
-                    # Format date number to the same precision as Excel.
-                    options["value"] = "%.16g" % date_time
+        if (
+            options["validate"] in ("date", "time")
+            and options["value"]
+            and supported_datetime(options["value"])
+        ):
+            date_time = self._convert_date_time(options["value"])
+            # Format date number to the same precision as Excel.
+            options["value"] = "%.16g" % date_time
 
             if options["maximum"]:
                 if supported_datetime(options["maximum"]):
@@ -6171,11 +6173,10 @@ def _write_sheet_view(self):
             attributes.append(("topLeftCell", self.top_left_cell))
 
         # Set the zoom level.
-        if self.zoom != 100:
-            if not self.page_view:
-                attributes.append(("zoomScale", self.zoom))
-                if self.zoom_scale_normal:
-                    attributes.append(("zoomScaleNormal", self.zoom))
+        if self.zoom != 100 and not self.page_view:
+            attributes.append(("zoomScale", self.zoom))
+            if self.zoom_scale_normal:
+                attributes.append(("zoomScaleNormal", self.zoom))
 
         attributes.append(("workbookViewId", 0))
 
@@ -7180,7 +7181,7 @@ def _write_custom_filter(self, operator, val):
             warn("Unknown operator = %s" % operator)
 
         # The 'equal' operator is the default attribute and isn't stored.
-        if not operator == "equal":
+        if operator != "equal":
             attributes.append(("operator", operator))
         attributes.append(("val", val))