turtleshell 1.1.0__tar.gz → 1.2.0__tar.gz

{turtleshell-1.1.0 → turtleshell-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: turtleshell
-Version: 1.1.0
+Version: 1.2.0
 Summary: Convenience wrapper around turtle.Turtle and turtle.Screen
 Author-email: Sam Mangan <sam.mangan2@gmail.com>
 License-Expression: MIT

{turtleshell-1.1.0 → turtleshell-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "turtleshell"
-version = "1.1.0"
+version = "1.2.0"
 authors = [
   { name="Sam Mangan", email="sam.mangan2@gmail.com" },
 ]
@@ -27,7 +27,7 @@ addopts = [
 ]
 
 [tool.bumpver]
-current_version = "1.1.0"
+current_version = "1.2.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

{turtleshell-1.1.0 → turtleshell-1.2.0}/src/turtleshell/__init__.py

@@ -1,3 +1,3 @@
 from .core import Screen, Turtle
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"

{turtleshell-1.1.0 → turtleshell-1.2.0}/src/turtleshell/core.py

@@ -76,16 +76,32 @@ class Turtle(turtle.RawTurtle):
   def y(self, value):
     self.sety(value)
 
-  @property
-  def shapewidth(self):
-    xcoords = [vertex[0] for vertex in self.get_shapepoly()]
-    return max(xcoords) - min(xcoords)
+  def shapesize(self, stretch_wid=None, stretch_len=None, outline=None):
 
-  @property
-  def shapeheight(self):
-    ycoords = [vertex[1] for vertex in self.get_shapepoly()]
-    return max(ycoords) - min(ycoords)
+    if stretch_wid is None and stretch_len is None and outline is None:
+      stretch_wid, stretch_len, outline = super().shapesize()
+      return stretch_wid*Turtle.MULT, stretch_len*Turtle.MULT, outline
+
+    stretch_wid = stretch_wid/Turtle.MULT if stretch_wid else None
+    stretch_len = stretch_len/Turtle.MULT if stretch_len else None
+    ret = super().shapesize(stretch_wid, stretch_len, outline)
+    return ret
+
+  def teleport(self, x, y):
+    pendown = self.isdown()
+    if pendown:
+      self.pen(pendown=False)
+    self.penup()
+    self._position = turtle.Vec2D(x, y)
+    self.pen(pendown=pendown)
+
+  def write(self, arg, move=False, align="center", font=("Arial", 18, "bold")):
+    super().write(arg, move, align, font)
 
+  def to_front(self):
+    self.goto(self.position())
+
+  ## HSV colour methods
   def hue(self, degrees):
     self.penhue(degrees)
     self.fillhue(degrees)
@@ -122,26 +138,6 @@ class Turtle(turtle.RawTurtle):
     self._fill_hsv.val = value/100
     self.fillcolor(_hsv_to_rgb(self._fill_hsv))
 
-  def shapesize(self, stretch_wid=None, stretch_len=None, outline=None):
-    if stretch_wid is None and stretch_len is None and outline is None:
-      stretch_wid, stretch_len, outline = super().shapesize()
-      return stretch_wid*Turtle.MULT, stretch_len*Turtle.MULT, outline
-
-    stretch_wid = stretch_wid/Turtle.MULT if stretch_wid else None
-    stretch_len = stretch_len/Turtle.MULT if stretch_len else None
-    ret = super().shapesize(stretch_wid, stretch_len, outline)
-    return ret
-
-  def teleport(self, x, y):
-    pendown = self.isdown()
-    if pendown:
-      self.pen(pendown=False)
-    self.penup()
-    self._position = turtle.Vec2D(x, y)
-    self.pen(pendown=pendown)
-
-  def write(self, arg, move=False, align="center", font=("Arial", 18, "bold")):
-    super().write(arg, move, align, font)
 
 Pen = Turtle
 
@@ -152,9 +148,7 @@ if __name__ == "__main__":
   print(f"\n\n***\nTURTLE TYPE: {type(pen)}\nSCREEN TYPE: {type(canvas)}\n***\n")
 
   pen.shape("square")
-  print(f"{pen.shapewidth}, {pen.shapeheight}")
   pen.shapesize(30, 25)
-  print(f"{pen.shapewidth}, {pen.shapeheight}")
 
   pen.hue(0)
   pen.stamp()
@@ -171,4 +165,4 @@ if __name__ == "__main__":
   pen.hue(240)
   pen.stamp()
 
-  canvas.exitonclick()
+  canvas.exitonclick()

{turtleshell-1.1.0 → turtleshell-1.2.0}/src/turtleshell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: turtleshell
-Version: 1.1.0
+Version: 1.2.0
 Summary: Convenience wrapper around turtle.Turtle and turtle.Screen
 Author-email: Sam Mangan <sam.mangan2@gmail.com>
 License-Expression: MIT

{turtleshell-1.1.0 → turtleshell-1.2.0}/tests/test_turtle.py

@@ -28,8 +28,10 @@ def test_y(pen):
 def test_shapesize_set(pen):
   pen.shape("square")
   pen.shapesize(30,40)
-  assert pen.shapewidth == 30
-  assert pen.shapeheight == 40
+  width, height, outline = pen.shapesize()
+  assert width == 30
+  assert height == 40
+  assert outline == 1
 
 def test_shapesize_get(pen):
   pen.shape("square")