linted

Author: ladyada

adafruit_display_shapes/circle.py

@@ -38,7 +38,6 @@
 
 """
 
-import displayio
 from adafruit_display_shapes.roundrect import RoundRect
 
 __version__ = "0.0.0-auto.0"

adafruit_display_shapes/rect.py

@@ -53,16 +53,17 @@ class Rect(displayio.TileGrid):
     def __init__(self, x, y, width, height, *, stroke=1, fill=None, outline=None):
         self._bitmap = displayio.Bitmap(width, height, 2)
         self._palette = displayio.Palette(2)
+        self.position = None # this is later set up by super()'s init
 
         if outline is not None:
             for w in range(width):
                 for line in range(stroke):
                     self._bitmap[w, line] = 1
                     self._bitmap[w, height-1-line] = 1
-            for h in range(height):
+            for _h in range(height):
                 for line in range(stroke):
-                    self._bitmap[line, h] = 1
-                    self._bitmap[width-1-line, h] = 1
+                    self._bitmap[line, _h] = 1
+                    self._bitmap[width-1-line, _h] = 1
             self._palette[1] = outline
         if fill is not None:
             self._palette[0] = fill
@@ -84,6 +85,6 @@ def y(self):
         """The y coordinate of the position"""
         return self.position[1]
 
-    @x.setter
+    @y.setter
     def y(self, y):
         self.position = (self.position[0], y)

adafruit_display_shapes/roundrect.py

@@ -50,10 +50,11 @@ class RoundRect(displayio.TileGrid):
     not change outer bound size set by width and height. Fill can be a hex value
     for the color or None for transparent. Outline can be a hex value for the color
     or None for no outline."""
-    def __init__(self, x, y, width, height, r, *, fill=None, outline=None, stroke=1):
+    def __init__(self, x, y, width, height, r, *, fill=None, outline=None, stroke=1): # pylint: disable=too-many-arguments
         self._bitmap = displayio.Bitmap(width, height, 3)
         self._palette = displayio.Palette(3)
         self._palette.make_transparent(0)
+        self.position = None # this is reset by the super().init
 
         if fill is not None:
             for i in range(0, width):   # draw the center chunk
@@ -72,16 +73,18 @@ def __init__(self, x, y, width, height, r, *, fill=None, outline=None, stroke=1)
                 for line in range(stroke):
                     self._bitmap[w, line] = 1
                     self._bitmap[w, height-line-1] = 1
-            for h in range(r, height-r):
+            for _h in range(r, height-r):
                 for line in range(stroke):
-                    self._bitmap[line, h] = 1
-                    self._bitmap[width-line-1, h] = 1
+                    self._bitmap[line, _h] = 1
+                    self._bitmap[width-line-1, _h] = 1
             # draw round corners
             self._helper(r, r, r, color=1, stroke=stroke,
                          x_offset=width-2*r-1, y_offset=height-2*r-1)
 
         super().__init__(self._bitmap, pixel_shader=self._palette, position=(x, y))
 
+
+    # pylint: disable=invalid-name, too-many-locals, too-many-branches
     def _helper(self, x0, y0, r, *, color, x_offset=0, y_offset=0,
                 stroke=1, cornerflags=0xF, fill=False):
         f = 1 - r
@@ -126,6 +129,7 @@ def _helper(self, x0, y0, r, *, color, x_offset=0, y_offset=0,
                 for line in range(stroke):
                     self._bitmap[x0+x+x_offset, y0-y+line] = color
                     self._bitmap[x0+y+x_offset-line, y0-x] = color
+    # pylint: enable=invalid-name, too-many-locals, too-many-branches
 
     @property
     def x(self):
@@ -141,6 +145,6 @@ def y(self):
         """The y coordinate of the position"""
         return self.position[1]
 
-    @x.setter
+    @y.setter
     def y(self, y):
         self.position = (self.position[0], y)