refactor: Sourcery refactored main branch (#1)

* 'Refactored by Sourcery'

* refactor: apply sourcery refactorings

- add sourcery configuration file
- rollback unwanted refactorings

Co-authored-by: Sourcery AI <>
Co-authored-by: César Román <thecesrom@gmail.com>

.sourcery.yaml

@@ -0,0 +1,25 @@
+ignore: []
+
+refactor:
+  include: []
+  skip:
+    - use-fstring-for-formatting
+  rule_types:
+    - refactoring
+    - suggestion
+    - comment
+  python_version: '3.9'
+
+metrics:
+  quality_threshold: 25.0
+
+clone_detection:
+  min_lines: 3
+  min_duplicates: 2
+  identical_clones_only: false
+
+github:
+  labels: []
+  ignore_labels: [sourcery-ignore]
+  request_review: author
+  sourcery_branch: sourcery/{base_branch}

src/com/inductiveautomation/ignition/common/model/__init__.py

@@ -33,13 +33,8 @@ def __eq__(self, other, strict=False):
         version_2 = [other.major, other.minor, other.rev]
 
         if strict:
-            version_1.append(self.build)
-            version_1.append(self.beta)
-            version_1.append(self.rc)
-            version_2.append(other.build)
-            version_2.append(other.beta)
-            version_2.append(other.rc)
-
+            version_1.extend((self.build, self.beta, self.rc))
+            version_2.extend((other.build, other.beta, other.rc))
         for i in range(max(len(version_1), len(version_2))):
             v_1 = version_1[i] if i < len(version_1) else 0
             v_2 = version_2[i] if i < len(version_2) else 0
@@ -75,11 +70,11 @@ def fromXML(inputStream):
         pass
 
     def getBasicString(self):
-        if self.rc > 0:
-            ret = "{}.{}.{}-rc{}".format(self.major, self.minor, self.rev, self.rc)
-        else:
-            ret = "{}.{}.{}".format(self.major, self.minor, self.rev)
-        return ret
+        return (
+            "{}.{}.{}-rc{}".format(self.major, self.minor, self.rev, self.rc)
+            if self.rc > 0
+            else "{}.{}.{}".format(self.major, self.minor, self.rev)
+        )
 
     def getBeta(self):
         return self.beta
@@ -128,17 +123,14 @@ def toParseableString(self):
 
     def toString(self):
         if self.rc > 0:
-            version = "{}.{}.{}-rc{} (b{})".format(
+            return "{}.{}.{}-rc{} (b{})".format(
                 self.major, self.minor, self.rev, self.rc, self.build
             )
-        elif self.isSnapshot():
-            version = "{}.{}.{}-SNAPSHOT (b{})".format(
+        if self.isSnapshot():
+            return "{}.{}.{}-SNAPSHOT (b{})".format(
                 self.major, self.minor, self.rev, self.build
             )
-        elif self.build is not None:
-            version = "{}.{}.{} (b{})".format(
-                self.major, self.minor, self.rev, self.build
-            )
-        else:
-            version = "{}.{}.{}".format(self.major, self.minor, self.rev)
-        return version
+        if self.build is not None:
+            return "{}.{}.{} (b{})".format(self.major, self.minor, self.rev, self.build)
+
+        return "{}.{}.{}".format(self.major, self.minor, self.rev)

src/system/date.py

@@ -278,12 +278,13 @@ def format(date, format="yyyy-MM-dd HH:mm:ss"):
     _format = _format.replace("S", "{:01}".format(_millis))
     _format = _format.replace("ss", "%S")
     _format = _format.replace("s", "%-S")
-    _format = _format.replace("w", "{}".format(_date.isocalendar()[1] + 1))
+    _format = _format.replace("w", "{}".format(_date.isocalendar()[2]))
     _format = _format.replace("u", "%w")
     _format = _format.replace(
         "W",
         "{}".format(_date.isocalendar()[1] - _date.replace(day=1).isocalendar()[1] + 1),
     )
+
     _format = _format.replace("XXX", "{:03.0f}:00".format(getTimezoneOffset()))
     _format = _format.replace("XX", "{:03.0f}00".format(getTimezoneOffset()))
     _format = _format.replace("X", "{:03.0f}".format(getTimezoneOffset()))