From 83903f43052808e1ca233091abdf3e358d732fe9 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 26 Dec 2018 18:16:23 -0500 Subject: [PATCH] PEP8 the activecode_ex4-fractal example I think that while teaching it is important to reflect good coding practices. Code formatting is one of those, which becomes increasingly important e.g. when students start collaborating and contributing code to other projects. That is why I think that all Python code samples should confirm with PEP 8, and this is a random sample I ran into while exploring new to me runestone initiative. Ideally, all code snippets should automagically go through flake8 or similar tool to guarantee that activecode snippets are all "kosher" --- .../ac_examples/activecode_ex4-fractal.txt | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/source/directives/ac_examples/activecode_ex4-fractal.txt b/source/directives/ac_examples/activecode_ex4-fractal.txt index 840f0f9..5a57942 100644 --- a/source/directives/ac_examples/activecode_ex4-fractal.txt +++ b/source/directives/ac_examples/activecode_ex4-fractal.txt @@ -12,45 +12,48 @@ ~~~~ import turtle - def drawTriangle(points,color,myTurtle): + + def drawTriangle(points, color, myTurtle): myTurtle.fillcolor(color) myTurtle.up() - myTurtle.goto(points[0][0],points[0][1]) + myTurtle.goto(points[0][0], points[0][1]) myTurtle.down() myTurtle.begin_fill() - myTurtle.goto(points[1][0],points[1][1]) - myTurtle.goto(points[2][0],points[2][1]) - myTurtle.goto(points[0][0],points[0][1]) + myTurtle.goto(points[1][0], points[1][1]) + myTurtle.goto(points[2][0], points[2][1]) + myTurtle.goto(points[0][0], points[0][1]) myTurtle.end_fill() - def getMid(p1,p2): - return ( (p1[0]+p2[0]) / 2, (p1[1] + p2[1]) / 2) - def sierpinski(points,degree,myTurtle): - colormap = ['blue','red','green','white','yellow', - 'violet','orange'] - drawTriangle(points,colormap[degree],myTurtle) + def getMid(p1, p2): + return (p1[0] + p2[0])/2, (p1[1] + p2[1])/2 + + + def sierpinski(points, degree, myTurtle): + colormap = ['blue', 'red', 'green', 'white', 'yellow', + 'violet', 'orange'] + drawTriangle(points, colormap[degree], myTurtle) if degree > 0: sierpinski([points[0], - getMid(points[0], points[1]), - getMid(points[0], points[2])], + getMid(points[0], points[1]), + getMid(points[0], points[2])], degree-1, myTurtle) sierpinski([points[1], - getMid(points[0], points[1]), - getMid(points[1], points[2])], + getMid(points[0], points[1]), + getMid(points[1], points[2])], degree-1, myTurtle) sierpinski([points[2], - getMid(points[2], points[1]), - getMid(points[0], points[2])], + getMid(points[2], points[1]), + getMid(points[0], points[2])], degree-1, myTurtle) - def main(): - myTurtle = turtle.Turtle() - myWin = turtle.Screen() - myPoints = [[-100,-50],[0,100],[100,-50]] - sierpinski(myPoints,3,myTurtle) - myWin.exitonclick() - main() + def main(): + myTurtle = turtle.Turtle() + myWin = turtle.Screen() + myPoints = [[-100, -50], [0, 100], [100, -50]] + sierpinski(myPoints, 3, myTurtle) + myWin.exitonclick() + main()