finished most of session 7

PythonCHB · PythonCHB · commit de7ef46099bc · 2014-11-17T23:36:41.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,6 @@
 slides_sources/build
-#ignore python compile files
 
-#ignore compile files, sublime workspace and project files
+#ignore compiled files, sublime workspace and project files
 *.pyc
 *.sublime*
 
-#ignore changes in Examples directory
-
-/Examples/
diff --git a/Examples/Session07/class_method.py b/Examples/Session07/class_method.py
@@ -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
diff --git a/Examples/Session07/properties_example.py b/Examples/Session07/properties_example.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+"""
+Example code for properties
+
+NOTE: if your getters and setters are this simple: don't do this!
+
+"""
+
+
+class C(object):
+    _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
+
diff --git a/Examples/Session07/static_method.py b/Examples/Session07/static_method.py
@@ -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()
+
+
diff --git a/slides_sources/source/homework/circle_class.rst b/slides_sources/source/homework/circle_class.rst
@@ -119,6 +119,76 @@ The user should not be able to set the area:
 Step 5:
 -------
 
-more to come...
+Add an "alternate constructor" that lets the user create a Circle directly
+with the diameter:
 
+.. code-block:: python
+
+    >> c = Circle.from_diameter(8)
+    >> print c.diameter
+    8
+    >> print c.radius
+    4
+
+Step 6:
+-------
+
+Add __str__ and __repr__ methods to your Circle class.
+
+Now you cant print it:
+
+.. code-block:: ipython
+
+    In [2]: c = Circle(4)
+
+    In [3]: print c
+    Circle with radius: 4.000000
+
+    In [4]: repr(c)
+    Out[4]: 'Circle(4)'
+
+    In [5]: d = eval(repr(c))
+
+    In [6]: d
+    Out[6]: Circle(4)
+
+Step 7:
+--------
+
+Add some of the numeric protocol to your Circle:
+
+you should be able to add two circles:
+
+.. code-block:: ipython
+
+    In [7]: c1 = Circle(2)
+
+    In [8]: c2 = Circle(4)
+
+    In [9]: c1 + c2
+    Out[9]: Circle(6)
+
+and multiply one times a number:
+
+.. code-block:: ipython
+
+    In [16]: c2 * 3
+    Out[16]: Circle(12)
+
+and compare them:
+
+.. code-block:: ipython
+    In [10]: c1 > c2
+    Out[10]: False
+
+    In [11]: c1 < c2
+    Out[11]: True
+
+    In [12]: c1 == c2
+    Out[12]: False
+
+    In [13]: c3 = Circle(4)
+
+    In [14]: c2 == c3
+    Out[14]: True
 
diff --git a/slides_sources/source/homework/html_builder.rst b/slides_sources/source/homework/html_builder.rst
@@ -197,7 +197,8 @@ HTML Primer
 ============
 
 .. rst-class:: medium
-The very least you need to know about html to do this assigment.
+
+    The very least you need to know about html to do this assigment.
 
 If you are familar with html, then this will all make sense to you. If you have
 never seen html before, this might be a bit intimidating, but you really don't
diff --git a/slides_sources/source/session07.rst b/slides_sources/source/session07.rst
