Minor code cleanup - addressing lgtm alerts.

CHANGES.txt

@@ -1,4 +1,7 @@
 Changelog:
+eduActiv8 - 4.20.05:
+    - Dutch translation by Steven Es
+    - code cleanup - addressing lgtm alerts
 eduActiv8 - 4.20.01:
     - Bug fix update.
     - Fixed the game crashing issue when launching any of the clock games when a non-default colour scheme is selected.

CREDITS.txt

@@ -13,6 +13,7 @@ Translations:
     Catalan - Guillem Jover - http://www.hadrons.org/~guillem/
             - updated by Jordi Mallach
     Bulgarian - Vanyo Georgiev
+    Dutch - Steven Es
     English UK - Ireneusz Imiolek (some corrections needed)
     English US - Ireneusz Imiolek (some corrections needed)
     Finnish - Aapo Rantalainen

classes/cversion.py

@@ -1 +1 @@
-ver = "4.20.03"
+ver = "4.20.05"

classes/dialog.py

@@ -29,7 +29,7 @@ def layout_update(self):
                 self.color = (0, 0, 0, 150)
         self.width = self.sizer.screen_w
         self.height = self.sizer.screen_h
-        self.image = pygame.Surface([self.width, self.height], flags=pygame.SRCALPHA)
+        self.image = pygame.Surface((self.width, self.height), flags=pygame.SRCALPHA)
         self.image.fill(self.color)
         self.rect = self.image.get_rect()
         self.rect.topleft = [0, 0]

classes/dialogwnd.py

@@ -19,7 +19,7 @@ def __init__(self, wnd, l, t, w, h, caption, img_src1, fsubmit, fargs):
         self.caption = ex.unival(caption)
         self.hover = False
         self.color = (255, 255, 255, 0)
-        self.image = pygame.Surface([self.w, self.h], flags=pygame.SRCALPHA)
+        self.image = pygame.Surface((self.w, self.h), flags=pygame.SRCALPHA)
 
         self.rect = self.image.get_rect()
         self.rect.topleft = [self.l, self.t]

classes/drw/clock.py

@@ -85,7 +85,7 @@ def draw_all(self, time=None):
         if time is not None:
             self.time = time
 
-        self.canvas = pygame.Surface([self.size, self.size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size, self.size - 1), flags=pygame.SRCALPHA)
         self.canvas.fill((0, 0, 0, 0))
 
         self.hands_vars()

classes/drw/clock_circular_diff.py

@@ -75,7 +75,7 @@ def __init__(self, game_board, wrapper, size, times, prefs):
     def draw_all(self, times):
         self.times = times
         self.diff_solution = self.get_diff()
-        self.canvas = pygame.Surface([self.size, self.size - 1])
+        self.canvas = pygame.Surface((self.size, self.size - 1))
         if self.game_board.mainloop.scheme is not None:
             self.canvas.fill(self.game_board.mainloop.scheme.u_color)
         else:

classes/drw/clock_linear_diff.py

@@ -83,7 +83,7 @@ def __init__(self, game_board, wrapper, width, height, times, prefs):
     def draw_all(self, times):
         self.times = times
         self.diff_solution = self.get_diff()
-        self.canvas = pygame.Surface([self.size[0], self.size[1] - 1])
+        self.canvas = pygame.Surface((self.size[0], self.size[1] - 1))
         if self.game_board.mainloop.scheme is not None:
             self.canvas.fill(self.game_board.mainloop.scheme.u_color)
         else:

classes/drw/clock_linear_diff2.py

@@ -80,7 +80,7 @@ def __init__(self, game_board, wrapper, width, height, times, prefs):
     def draw_all(self, times):
         self.times = times
         self.diff_solution = self.get_diff()
-        self.canvas = pygame.Surface([self.size[0], self.size[1] - 1])
+        self.canvas = pygame.Surface((self.size[0], self.size[1] - 1))
         if self.game_board.mainloop.scheme is not None:
             self.canvas.fill(self.game_board.mainloop.scheme.u_color)
         else:

classes/drw/fraction.py

@@ -13,7 +13,7 @@ def __init__(self, unit_size, scale, color1, color2, numbers, fract_type):
         self.color2 = color2
         self.numbers = numbers
 
-        self.canvas = pygame.Surface([self.size, self.size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size, self.size - 1), flags=pygame.SRCALPHA)
         self.canvas.fill((0, 0, 0, 0))
 
         self.drawing_f = [self.draw_circles, self.draw_minicircles, self.draw_polygons, self.draw_petals]

classes/drw/fraction_hq.py

@@ -18,7 +18,7 @@ def __init__(self, unit_size, scale, color1, color2, border_color1, border_color
         self.numbers = numbers
         self.border_width = border_width
 
-        self.canvas = pygame.Surface([self.size, self.size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size, self.size - 1), flags=pygame.SRCALPHA)
 
         self.offset_selected = self.size // 30
         self.offset_unselected = self.size // 60

classes/drw/percentage_hq.py

@@ -18,7 +18,7 @@ def __init__(self, unit_size, scale, color1, color2, border_color1, border_color
         self.number = number
         self.type = type
 
-        self.canvas = pygame.Surface([self.size, self.size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size, self.size - 1), flags=pygame.SRCALPHA)
         self.canvas.fill((0, 0, 0, 0))
 
         self.draw_circles()

classes/drw/percentage_multi_hq.py

@@ -13,7 +13,7 @@ def __init__(self, unit_size, scale, colors, b_colors, numbers):
         self.numbers = numbers
         self.type = type
 
-        self.canvas = pygame.Surface([self.size, self.size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size, self.size - 1), flags=pygame.SRCALPHA)
         self.set_colors(colors, b_colors)
         self.redraw()
 

classes/drw/ratio_hq.py

@@ -20,7 +20,7 @@ def __init__(self, unit_size, scale, color1, color2, color3, border_color1, bord
         self.numbers = numbers
         self.type = type
 
-        self.canvas = pygame.Surface([self.size, self.size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size, self.size - 1), flags=pygame.SRCALPHA)
         self.canvas.fill((0, 0, 0, 0))
 
         self.draw_minicircles()

classes/drw/splash.py

@@ -41,7 +41,7 @@ def __init__(self, unit_size, scale, preset_color, custom_color=(-1, -1, -1, -1)
         size = unit_size * scale
         self.scaled_lines = [[int(size * each[0] / 200.0), int(size * each[1] / 200.0)] for each in Splash.lines]
 
-        self.canvas = pygame.Surface([size, size - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((size, size - 1), flags=pygame.SRCALPHA)
         self.canvas.fill((0, 0, 0, 0))
         if custom_color[0] > -1:
             col = ex.hsva_to_rgba(custom_color[0], custom_color[1], custom_color[2], custom_color[3])

classes/drw/thermometer.py

@@ -23,7 +23,7 @@ def __init__(self, game_board, width, height, scale, color, border_color, rng, n
         self.v_gauge_margin_t = int(120 * self.size[0] / 500.0)
         self.v_gauge_margin_b = int(120 * self.size[0] / 500.0) + self.bottom_r
 
-        self.canvas = pygame.Surface([self.size[0], self.size[1] - 1], flags=pygame.SRCALPHA)
+        self.canvas = pygame.Surface((self.size[0], self.size[1] - 1), flags=pygame.SRCALPHA)
         self.canvas.fill((0, 0, 0, 0))
         self.draw_thermometer()