Merge branch 'prokaktus-master'

Author: faif

proxy.py

@@ -5,9 +5,6 @@
 
 
 class SalesManager:
-    def work(self):
-        print("Sales Manager working...")
-
     def talk(self):
         print("Sales Manager ready to talk")
 
@@ -17,7 +14,7 @@ def __init__(self):
         self.busy = 'No'
         self.sales = None
 
-    def work(self):
+    def talk(self):
         print("Proxy checking for Sales Manager availability")
         if self.busy == 'No':
             self.sales = SalesManager()
@@ -29,24 +26,21 @@ def work(self):
 
 
 class NoTalkProxy(Proxy):
-    def __init__(self):
-        Proxy.__init__(self)
-
-    def work(self):
+    def talk(self):
         print("Proxy checking for Sales Manager availability")
         time.sleep(2)
         print("This Sales Manager will not talk to you whether he/she is busy or not")
 
 
 if __name__ == '__main__':
     p = Proxy()
-    p.work()
+    p.talk()
     p.busy = 'Yes'
-    p.work()
+    p.talk()
     p = NoTalkProxy()
-    p.work()
+    p.talk()
     p.busy = 'Yes'
-    p.work()
+    p.talk()
 
 ### OUTPUT ###
 # Proxy checking for Sales Manager availability