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

Author: salimhamed

.gitignore

@@ -1,6 +1,15 @@
 slides_sources/build
 
+.DS_Store
 #ignore compiled files, sublime workspace and project files
 *.pyc
+*junk*
+
+#ignore sublime workspace files
 *.sublime*
-*.*~
+
+# ignore .gitignore, so we can each have our own.
+.gitignore
+
+# editor back-up files
+*.*~

Examples/Session06/html_render/test_html_output1.html

@@ -9,9 +9,9 @@ def new_function(*args, **kwargs):
 
 
 def add(a, b):
-    print "Function 'add' called with args: %r" % locals()
+#    print "Function 'add' called with args: %r" % locals()
     result = a + b
-    print "\tResult --> %r" % result
+#    print "\tResult --> %r" % result
     return result
 
 
@@ -32,7 +32,7 @@ def simple_add(a, b):
     return a + b
 
 
-class Memoize:
+class Memoize(object):
     """
     memoize decorator from avinash.vora
     http://avinashv.net/2008/04/python-decorators-syntactic-sugar/
@@ -49,9 +49,13 @@ def __call__(self, *args):  # runs when memoize instance is called
             return self.memoized[args]
 
 
-@Memoize
+#@Memoize
 def sum2x(n):
     return sum(2 * i for i in xrange(n))
+sum2x = Memoize(sum2x)
+
+
+
 
 import time
 
@@ -69,3 +73,5 @@ def timed(*args, **kwargs):
 @Memoize
 def sum2x(n):
     return sum(2 * i for i in xrange(n))
+
+