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

Author: rajban1918

.gitignore

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

Examples/Session06/html_render/test_html_output1.html

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+"""
+example of a class method
+"""
+
+
+class C(object):
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    @classmethod
+    def a_class_method(cls, y):
+        print "in a_class_method", cls
+        return cls(y, y**2)
+
+
+class C2(C):
+    pass
+
+
+if __name__ == "__main__":
+
+    c = C(3, 4)
+    print type(c), c.x, c.y
+
+    c2 = C.a_class_method(3)
+    print type(c2), c2.x, c2.y
+
+    c3 = c2.a_class_method(2)
+    print type(c3), c3.x, c3.y

Examples/Session06/html_render/test_html_output2.html

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+"""
+Example code for properties
+
+NOTE: if your getters and setters are this simple: don't do this!
+
+"""
+
+
+class C(object):
+    def __init__(self):
+        self._x = None
+    @property
+    def x(self):
+        return self._x
+    @x.setter
+    def x(self, value):
+        self._x = value
+    @x.deleter
+    def x(self):
+        del self._x
+
+if __name__ == "__main__":
+    c = C()
+    c.x = 5
+    print c.x
+

Examples/Session06/html_render/test_html_output3.html

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+"""
+examples of a static methods
+"""
+
+
+class C(object):
+
+    @staticmethod
+    def a_static_method(a, b):
+        print "in a_static_method"
+        return a+b
+
+    def test(self):
+        return self.a_static_method(2,3)
+
+# if __name__ == "__main__":
+
+#     print C.a_static_method(3,4)
+
+#     c = C()
+
+#     print c.a_static_method(4,5)
+
+#     print c.test()
+
+