Merge branch 'luoxing91-master'

faif · faif · commit 37b11da559f6 · 2014-05-05T15:24:29.000+02:00
diff --git a/3-tier.py b/3-tier.py
@@ -38,7 +38,8 @@ def __init__(self):
     def get_product_list(self):
         print('PRODUCT LIST:')
         for product in self.business_logic.product_list():
-            print(product)
+            #print(product)
+            yield product
         print('')
 
     def get_product_information(self, product):
diff --git a/null.py b/null.py
@@ -36,23 +36,40 @@ def __str__(self):
 
 
 def test():
-    """Perform some decent tests, or rather: demos."""
+    """
+    Perform some decent tests, or rather: demos.
+    >>> print(Null())
+    Null
+    >>> print(Null('value'))
+    Null
+    >>> n= Null('vale',param='value')
+    >>> print(n)
+    Null
+    >>> n()
+    <Null>
+    >>> n('value')
+    <Null>
+    >>> n('value', param='value')
+    <Null>
+    >>> print(n)
+    Null
+    """
 
     # constructing and calling
 
-    n = Null()
-    print(n)
+    #n = Null()
+    #print(n)
 
-    n = Null('value')
-    print(n)
+    #n = Null('value')
+    #print(n)
 
     n = Null('value', param='value')
-    print(n)
+    #print(n)
 
     n()
-    n('value')
-    n('value', param='value')
-    print(n)
+    #n('value')
+    #n('value', param='value')
+    #print(n)
 
     # attribute handling
 
@@ -81,7 +98,8 @@ def test():
 
 if __name__ == '__main__':
     test()
-
+    import doctest
+    doctest.testmod()
 ### OUTPUT ###
 # Null
 # Null
