Merge branch 'master' of https://github.com/UWPCE-PythonCert/IntroPython-2017

Author: brhelodrvr

materials/source/lightning_talks.rst

@@ -104,14 +104,24 @@ Zandra Eng: How I got here
 
 
 
-John Navitsky
--------------
+John Navitsky: Ansible and python
+---------------------------------
 
-Matthew Sachio Maeda
---------------------
+Simple, modular, written in Python...
+
+Matthew Sachio Maeda: Celery
+----------------------------
+
+Parallel task runner.
+
+
+Morgan Heinemann: Selenium
+--------------------------
+
+Open source project for web automation.
+
+Can be driven by Python (and other languages)
 
-Morgan Heinemann
-----------------
 
 James Takata
 ------------

materials/source/notes/session08.rst

@@ -18,6 +18,8 @@ Matthew Sachio Maeda
 
 Morgan Heinemann
 
+Let's take a look at the past lightning talks list -- make sure we haven't missed anyone.
+
 
 Issues that came up during the week.
 ====================================
@@ -58,16 +60,37 @@ I know I started out that way -- 'cause there wasn't anything else to test. But
 
 
 Do you always need an __init__?
-------------------------------
+-------------------------------
 
 No -- you don't :-)
 
-The ONLY thing "special" about __init__ is that it is automatically called when and instance is created.  Other than that, it's a regular method. So if you don't define one, then the superclass' __init__ will be called.
+The ONLY thing "special" about __init__ is that it is automatically called when an instance is created.  Other than that, it's a regular method. So if you don't define one, then the superclass' __init__ will be called.
 
 That's what inheritance is all about -- the subclass inherits ALL the superclasses methods -- including __init__.
 
 So never write an __init__ that does nothing but call the superclass __init__
 
+Subclasses and ``self``
+-----------------------
+
+``self`` is the first parameter in all methods. But why??
+
+``self`` is the "current" instance of the object. This means that you don't know at code writing time what type it is -- is it the current class? some subclass?
+
+Let's experiment with that.
+
+html_render
+-----------
+
+Let's look at up to step 3....
+
+And move along...
+
+Lightning Talks
+---------------
+
+Circle class....
+
 
 
 

students/Chris/session07/html_render.py

@@ -5,34 +5,46 @@ class Element():
     tag = 'html'
     indent = '  '
 
-    def __init__(self, content=None):
+    def __init__(self, content=None, **kwargs):
         if content is None:
             self.content = []
         else:
             self.content = [content]
+        self.attributes = kwargs
 
     def append(self, content):
         self.content.append(content)
 
     def render(self, file_obj, cur_ind=""):
-        open_tag = '{}<{}>'.format(cur_ind, self.tag)
+        open_tag = self.get_open_tag()
         close_tag = '{}</{}>'.format(cur_ind, self.tag)
 
+        file_obj.write(cur_ind)
         file_obj.write(open_tag)
         file_obj.write("\n")
         for each in self.content:
-            if isinstance(each, str):
+            try:
+                each.render(file_obj, cur_ind + self.indent)
+            except AttributeError:
                 file_obj.write(cur_ind + self.indent)
                 file_obj.write(each)
-            else:
-                each.render(file_obj, cur_ind + self.indent)
             file_obj.write("\n")
         file_obj.write(close_tag)
 
+    def get_open_tag(self):
+        open_tag = '<{}'.format(self.tag)
+        for at, val in self.attributes.items():
+            open_tag += ' {}="{}"'.format(at, val)
+        open_tag += "> "
+        return open_tag
+
+
 class OneLineTag(Element):
     def render(self, file_obj, cur_ind=""):
         # there is some repition here -- maybe factor that out?
-        file_obj.write('{}<{}> '.format(cur_ind, self.tag))
+        open_tag = self.get_open_tag()
+        file_obj.write(cur_ind)
+        file_obj.write(open_tag)
         for each in self.content:
             # OneLineTags should only have strings...
             file_obj.write(each)

students/Chris/session07/test_html_render.py

@@ -242,13 +242,15 @@ def test_indent():
     Tests that the indentation gets passed through to the renderer
     """
     html = HTML("some content")
-    file_contents = render_element(html, cur_ind="   ")
+    cur_ind = 6 * " "
+    file_contents = render_element(html, cur_ind=cur_ind)
 
     print(file_contents)
     lines = file_contents.split("\n")
 
-    assert lines[0].startswith("   <")
-    assert lines[-1].startswith("   <")
+    assert lines[0].startswith(cur_ind + "<")
+    assert lines[1].startswith(cur_ind + Element.indent + "som")
+    assert lines[-1].startswith(cur_ind + "<")
 
 
 def test_indent_contents():
@@ -349,5 +351,75 @@ def test_full_page_with_title():
     # assert False
 
 
+def test_single_attribute():
+    # <p style="text-align: center; font-style: oblique;">
+    #             Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text
+    #         </p>
+    p = Para("Here is a paragraph of text", style="text-align: center; font-style: oblique;")
+
+    results = render_element(p)
+
+    assert results.startswith('<p style="text-align: center; font-style: oblique;">')
+
+    print(results)
+
+def test_multiple_attributes():
+    # <p style="text-align: center; font-style: oblique;">
+    #             Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text
+    #         </p>
+    p = Para("Here is a paragraph of text",
+             id="fred",
+             color="red",
+             size="12px",
+             )
+
+    results = render_element(p)
+    print(results)
+
+    lines = results.split('\n')
+    assert lines[0].startswith('<p ')
+    assert lines[0].endswith('"> ')
+    assert 'id="fred"' in lines[0]
+    assert 'color="red"' in lines[0]
+    assert 'size="12px"' in lines[0]
+
+def test_multiple_attributes_title():
+    t = Title("Here is a paragraph of text",
+              id="fred",
+              color="red",
+              size="12px",
+              )
+
+    results = render_element(t)
+    print(results)
+
+    lines = results.split('\n')
+    assert lines[0].startswith('<title ')
+    assert lines[0].endswith('</title>')
+    assert 'id="fred"' in lines[0]
+    assert 'color="red"' in lines[0]
+    assert 'size="12px"' in lines[0]
+
+
+# test class attribute
+def test_class_attribute():
+    atts = {"id": "fred",
+            "class": "special",
+            "size": "12px",
+            }
+    p = Para("Here is a paragraph of text",
+              **atts)
+
+    results = render_element(p)
+    print(results)
+
+    lines = results.split('\n')
+    assert lines[0].startswith('<p ')
+    assert lines[0].strip().endswith('">')
+    assert 'id="fred"' in lines[0]
+    assert 'class="special"' in lines[0]
+    assert 'size="12px"' in lines[0]
+
+
 
 

students/Chris/session08/circle.py

@@ -0,0 +1,28 @@
+"""
+nifty Circle class
+"""
+
+from math import pi
+
+class Circle:
+    def __init__(self, radius):
+        self.radius = radius
+
+    @property
+    def diameter(self):
+        return 2 * self.radius
+    @diameter.setter
+    def diameter(self, val):
+        self.radius = val / 2
+
+    @property
+    def area(self):
+        return pi * self.radius**2
+
+    def __repr__(self):
+        return "Circle({})".format(self.radius)
+
+    def __str__(self):
+        return "Circle with radius: {}".format(self.radius)
+
+

students/Chris/session08/test_circle.py

@@ -0,0 +1,64 @@
+"""
+tests for Circle class
+"""
+
+from math import pi
+import pytest
+
+from circle import Circle
+
+
+def test_init():
+    Circle(5)
+
+    assert True
+
+def test_radius():
+    c = Circle(5)
+
+    assert c.radius == 5
+
+def test_diameter():
+    c = Circle(4)
+
+    assert c.diameter == 8
+
+
+def test_change_radius():
+    c = Circle(4)
+
+    assert c.diameter == 8
+
+    c.radius = 5
+    assert c.radius == 5
+    assert c.diameter == 10
+
+
+def test_change_diameter():
+    c = Circle(4)
+
+    assert c.diameter == 8
+
+    c.diameter = 10
+    assert c.radius == 5
+    assert c.diameter == 10
+
+def test_area():
+    c = Circle(10)
+
+    assert c.area == pi * 10**2
+
+def test_set_area():
+
+    c = Circle(10)
+
+    with pytest.raises(AttributeError):
+        c.area = 100
+
+def test_delete_diameter():
+    c = Circle(10)
+
+    with pytest.raises(AttributeError):
+        del c.diameter
+
+