a litle bit of clean up of the html_render solution

PythonCHB · PythonCHB · commit ea32f41c5d93 · 2014-11-15T18:14:11.000-08:00
diff --git a/Examples/Session06/html_render/run_html_render.py b/Examples/Session06/html_render/run_html_render.py
@@ -6,17 +6,18 @@
 Uncomment the steps as you add to your rendering.
 
 """
+
 from cStringIO import StringIO
 
 
 # importing the html_rendering code with a short name for easy typing.
 import html_render as hr
-reload(hr) #reloding in case you are ruuing this in iPython
-           # -- want to make sure the latest version is used
+reload(hr) # reloading in case you are running this in iPython
+           #  -- we want to make sure the latest version is used
 
 
 ## writing the file out:
-def render(page, filename):
+def render_page(page, filename):
     """
     render the tree of elements
 
@@ -27,11 +28,11 @@ def render(page, filename):
     f = StringIO()
     page.render(f, "    ")
 
-    f.seek(0)
+    f.reset()
 
     print f.read()
 
-    f.seek(0)
+    f.reset()
     open(filename, 'w').write( f.read() )
 
 
@@ -44,7 +45,7 @@ def render(page, filename):
 
 page.append("And here is another piece of text -- you should be able to add any number")
 
-render(page, "test_html_output1.html")
+render_page(page, "test_html_output1.html")
 
 # ## Step 2
 # ##########
@@ -59,7 +60,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output2.html")
+# render_page(page, "test_html_output2.html")
 
 # # Step 3
 # ##########
@@ -78,7 +79,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output3.html")
+# render_page(page, "test_html_output3.html")
 
 # # Step 4
 # ##########
@@ -97,7 +98,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output4.html")
+# render_page(page, "test_html_output4.html")
 
 # # Step 5
 # #########
@@ -118,7 +119,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output5.html")
+# render_page(page, "test_html_output5.html")
 
 # # Step 6
 # #########
@@ -143,7 +144,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output6.html")
+# render_page(page, "test_html_output6.html")
 
 # # Step 7
 # #########
@@ -180,7 +181,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output7.html")
+# render_page(page, "test_html_output7.html")
 
 # # Step 8
 # ########
@@ -199,7 +200,7 @@ def render(page, filename):
 # body.append( hr.H(2, "PythonClass - Class 6 example") )
 
 # body.append(hr.P("Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text",
-#               style="text-align: center; font-style: oblique;"))
+#                  style="text-align: center; font-style: oblique;"))
 
 # body.append(hr.Hr())
 
@@ -219,7 +220,7 @@ def render(page, filename):
 
 # page.append(body)
 
-# render(page, "test_html_output8.html")
+# render_page(page, "test_html_output8.html")
 
 
 
diff --git a/Solutions/Session06/html_render.py b/Solutions/Session06/html_render.py
@@ -89,7 +89,7 @@ class Html(Element):
     tag = 'html'
     def render(self, file_out, current_ind=""):
         file_out.write("<!DOCTYPE html>\n")
-        Element.render(self, file_out, current_ind=self.indent)
+        Element.render(self, file_out, current_ind=current_ind)
 
 
 class Body(Element):
diff --git a/Solutions/Session06/test_html_render.py b/Solutions/Session06/test_html_render.py
@@ -81,19 +81,20 @@ def test_render_content_indent():
     assert lines[1].startswith("    ")
 
 
-def test_render_html():
-    """ the html element """
+## this one no longer currect with step 8 added
+# def test_render_html():
+#     """ the html element """
 
-    e = hr.Html("this is some content")
-    e.append("and this is some more")
+#     e = hr.Html("this is some content")
+#     e.append("and this is some more")
 
-    output = render_element(e)
+#     output = render_element(e)
 
-    print output
-    assert output.startswith('<html>')
-    assert output.endswith('</html>\n')
-    assert "this is some content" in output
-    assert "and this is some more" in output
+#     print output
+#     assert output.startswith('<html>')
+#     assert output.endswith('</html>\n')
+#     assert "this is some content" in output
+#     assert "and this is some more" in output
 
 
 def test_render_body():
@@ -196,7 +197,7 @@ def test_anchor():
     output = render_element(e, ind="    ")
 
     print output
-    assert output ==  '    <a href="http://google.com">link to google</a>\n'
+    assert output == '    <a href="http://google.com">link to google</a>\n'
 
 
 def test_header():
@@ -207,10 +208,27 @@ def test_header():
     print output
     assert output == '    <h2>The text of the header</h2>\n'
 
+
 def test_header3():
     e = hr.H(3, "The text of the header")
 
     output = render_element(e, ind="    ")
 
     print output
     assert output == '    <h3>The text of the header</h3>\n'
+
+
+def test_doctype():
+    """
+    html element should render teh doctype header, too
+    """
+
+    e = hr.Html("Just a tiny bit of content")
+
+    output = render_element( e )
+
+    print output
+    assert output.startswith("<!DOCTYPE html>")
+    assert "<html>" in output
+    assert output.endswith("</html>\n")
+
diff --git a/slides_sources/source/session09.rst b/slides_sources/source/session09.rst
@@ -0,0 +1,27 @@
+
+.. Foundations 2: Python slides file, created by
+   hieroglyph-quickstart on Wed Apr  2 18:42:06 2014.
+
+
+******************************************************************
+Session Nine: Decorators, Context Managers, Packages and packaging
+******************************************************************
+
+======================
+Lightning Talks Today:
+======================
+
+.. rst-class:: medium
+
+  person 1
+
+  person 2
+
+  person 3
+
+  person 4
+
+================
+Review/Questions
+================
+
