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

Conflicts:
	.gitignore

Author: Carolyn.Evans

.gitignore

@@ -1,4 +1,6 @@
 slides_sources/build
 .idea
 .DS_Store
+#ignore compiled files, sublime workspace and project files
 *.pyc
+*.sublime*

Examples/Session03/test_script.py

@@ -8,6 +8,7 @@
 
 # Python > Warmup-1 > sleep_in
 
+
 def sleep_in(weekday, vacation):
     return not (weekday == True and vacation == False)
 

Examples/Session04/junk2.txt

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+"""
+When squirrels get together for a party, they like to have cigars.
+A squirrel party is successful when the number of cigars is between
+40 and 60, inclusive. Unless it is the weekend, in which case there
+is no upper bound on the number of cigars.
+
+Return True if the party with the given values is successful,
+or False otherwise.
+"""
+
+
+def cigar_party(cigars, is_weekend):
+    """
+    basic solution
+    """
+    if ( 40 <= cigars <= 60 ) or ( cigars >= 40 and is_weekend):
+        return True
+    else:
+        return False
+
+
+def cigar_party3(cigars, is_weekend):
+    """
+    conditional expression
+    """
+    return (cigars >= 40) if is_weekend else (cigars >= 40 and cigars <= 60)

Examples/Session05/codingbat.py

@@ -2,31 +2,16 @@
 
 """
 Python class example.
-
 """
 
 
 # The start of it all:
 # Fill it all in here.
 class Element(object):
-    tag = 'html'
-    indent = '    '
 
     def __init__(self, content=None):
-        if content is not None:
-            self.content = [str(content)]
-        else:
-            self.content = []
-
+        pass
     def append(self, new_content):
-        """ add some new content to the element"""
-        self.content.append(new_content)
-
+        pass
     def render(self, file_out, ind=""):
-        """render the content to the given file like object"""
-
-        file_out.write( ind+"<"+self.tag+">\n"+ind+self.indent )
-        file_out.write( ("\n"+ind+self.indent).join(self.content) )
-        file_out.write( "\n"+ind+"</"+self.tag+">" )
-
-
+        file_out.write("just something as a place holder...")

Examples/Session06/cigar_party.py

@@ -6,16 +6,18 @@
 Uncomment the steps as you add to your rendering.
 
 """
-from io import open, StringIO
+
+from cStringIO import StringIO
 
 
 # importing the html_rendering code with a short name for easy typing.
 import html_render as hr
-reload(hr)
+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
 
@@ -24,26 +26,26 @@ def render(page, filename):
     """
 
     f = StringIO()
-    page.render(f, u"    ")
+    page.render(f, "    ")
 
-    f.seek(0)
+    f.reset()
 
     print f.read()
 
-    f.seek(0)
-    open(filename, 'w', encoding="utf-8").write( f.read() )
+    f.reset()
+    open(filename, 'w').write( f.read() )
 
 
 ## Step 1
 ##########
 
 page = hr.Element()
 
-page.append(u"Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text")
+page.append("Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text")
 
-page.append(u"And here is another piece of text -- you should be able to add any number")
+page.append("And here is another piece of text -- you should be able to add any number")
 
-render(page, u"test_html_output1.html")
+render_page(page, "test_html_output1.html")
 
 # ## Step 2
 # ##########
@@ -52,134 +54,134 @@ def render(page, filename):
 
 # body = hr.Body()
 
-# body.append(hr.P(u"Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text"))
+# 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"))
 
-# body.append(hr.P(u"And here is another piece of text -- you should be able to add any number"))
+# body.append(hr.P("And here is another piece of text -- you should be able to add any number"))
 
 # page.append(body)
 
-# render(page, u"test_html_output2.html")
+# render_page(page, "test_html_output2.html")
 
 # # Step 3
 # ##########
 
 # page = hr.Html()
 
 # head = hr.Head()
-# head.append(hr.Title(u"PythonClass = Revision 1087:"))
+# head.append(hr.Title("PythonClass = Revision 1087:"))
 
 # page.append(head)
 
 # body = hr.Body()
 
-# body.append(hr.P(u"Here is a paragraph of text -- there could be more of them, but this is enough  to show that we can do some text"))
-# body.append(hr.P(u"And here is another piece of text -- you should be able to add any number"))
+# 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"))
+# body.append(hr.P("And here is another piece of text -- you should be able to add any number"))
 
 # page.append(body)
 
-# render(page, u"test_html_output3.html")
+# render_page(page, "test_html_output3.html")
 
 # # Step 4
 # ##########
 
 # page = hr.Html()
 
 # head = hr.Head()
-# head.append(hr.Title(u"PythonClass = Revision 1087:"))
+# head.append(hr.Title("PythonClass = Revision 1087:"))
 
 # page.append(head)
 
 # body = hr.Body()
 
-# body.append(hr.P(u"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=u"text-align: center; font-style: oblique;"))
+# 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;"))
 
 # page.append(body)
 
-# render(page, u"test_html_output4.html")
+# render_page(page, "test_html_output4.html")
 
 # # Step 5
 # #########
 
 # page = hr.Html()
 
 # head = hr.Head()
-# head.append(hr.Title(u"PythonClass = Revision 1087:"))
+# head.append(hr.Title("PythonClass = Revision 1087:"))
 
 # page.append(head)
 
 # body = hr.Body()
 
-# body.append(hr.P(u"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=u"text-align: center; font-style: oblique;"))
+# 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;"))
 
 # body.append(hr.Hr())
 
 # page.append(body)
 
-# render(page, u"test_html_output5.html")
+# render_page(page, "test_html_output5.html")
 
 # # Step 6
 # #########
 
 # page = hr.Html()
 
 # head = hr.Head()
-# head.append(hr.Title(u"PythonClass = Revision 1087:"))
+# head.append(hr.Title("PythonClass = Revision 1087:"))
 
 # page.append(head)
 
 # body = hr.Body()
 
-# body.append(hr.P(u"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=u"text-align: center; font-style: oblique;"))
+# 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;"))
 
 # body.append(hr.Hr())
 
-# body.append(u"And this is a ")
-# body.append( hr.A(u"http://google.com/", "link") )
-# body.append(u"to google")
+# body.append("And this is a ")
+# body.append( hr.A("http://google.com/", "link") )
+# body.append("to google")
 
 # page.append(body)
 
-# render(page, u"test_html_output6.html")
+# render_page(page, "test_html_output6.html")
 
 # # Step 7
 # #########
 
 # page = hr.Html()
 
 # head = hr.Head()
-# head.append(hr.Title(u"PythonClass = Revision 1087:"))
+# head.append(hr.Title("PythonClass = Revision 1087:"))
 
 # page.append(head)
 
 # body = hr.Body()
 
-# body.append( hr.H(2, u"PythonClass - Class 6 example") )
+# body.append( hr.H(2, "PythonClass - Class 6 example") )
 
-# body.append(hr.P(u"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=u"text-align: center; font-style: oblique;"))
+# 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;"))
 
 # body.append(hr.Hr())
 
-# list = hr.Ul(id=u"TheList", style=u"line-height:200%")
+# list = hr.Ul(id="TheList", style="line-height:200%")
 
-# list.append( hr.Li(u"The first item in a list") )
-# list.append( hr.Li(u"This is the second item", style="color: red") )
+# list.append( hr.Li("The first item in a list") )
+# list.append( hr.Li("This is the second item", style="color: red") )
 
 # item = hr.Li()
-# item.append(u"And this is a ")
-# item.append( hr.A(u"http://google.com/", u"link") )
-# item.append(u"to google")
+# item.append("And this is a ")
+# item.append( hr.A("http://google.com/", "link") )
+# item.append("to google")
 
 # list.append(item)
 
 # body.append(list)
 
 # page.append(body)
 
-# render(page, u"test_html_output7.html")
+# render_page(page, "test_html_output7.html")
 
 # # Step 8
 # ########
@@ -188,37 +190,37 @@ def render(page, filename):
 
 
 # head = hr.Head()
-# head.append( hr.Meta(charset=u"UTF-8") )
-# head.append(hr.Title(u"PythonClass = Revision 1087:"))
+# head.append( hr.Meta(charset="UTF-8") )
+# head.append(hr.Title("PythonClass = Revision 1087:"))
 
 # page.append(head)
 
 # body = hr.Body()
 
-# body.append( hr.H(2, u"PythonClass - Class 6 example") )
+# body.append( hr.H(2, "PythonClass - Class 6 example") )
 
-# body.append(hr.P(u"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=u"text-align: center; font-style: oblique;"))
+# 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;"))
 
 # body.append(hr.Hr())
 
-# list = hr.Ul(id=u"TheList", style=u"line-height:200%")
+# list = hr.Ul(id="TheList", style="line-height:200%")
 
-# list.append( hr.Li(u"The first item in a list") )
-# list.append( hr.Li(u"This is the second item", style="color: red") )
+# list.append( hr.Li("The first item in a list") )
+# list.append( hr.Li("This is the second item", style="color: red") )
 
 # item = hr.Li()
-# item.append(u"And this is a ")
-# item.append( hr.A(u"http://google.com/", "link") )
-# item.append(u"to google")
+# item.append("And this is a ")
+# item.append( hr.A("http://google.com/", "link") )
+# item.append("to google")
 
 # list.append(item)
 
 # body.append(list)
 
 # page.append(body)
 
-# render(page, u"test_html_output8.html")
+# render_page(page, "test_html_output8.html")