change abstract_factory

Author: xingfeT

abstract_factory.py

@@ -7,20 +7,17 @@
 
 importrandom
 
-
 classPetShop:
 
 """A pet shop"""
 
 def__init__(self, animal_factory=None):
-"""pet_factory is our abstract factory.
- We can set it at will."""
+"""pet_factory is our abstract factory. We can set it at will."""
 
 self.pet_factory=animal_factory
 
 defshow_pet(self):
-"""Creates and shows a pet using the
- abstract factory"""
+"""Creates and shows a pet using the abstract factory"""
 
 pet=self.pet_factory.get_pet()
 print("We have a lovely{}".format(pet))
@@ -55,19 +52,12 @@ class DogFactory:
 defget_pet(self):
 returnDog()
 
-defget_food(self):
-return"dog food"
-
 
 classCatFactory:
 
 defget_pet(self):
 returnCat()
 
-defget_food(self):
-return"cat food"
-
-
 # Create the proper family
 defget_factory():
 """Let's be dynamic!"""
@@ -76,9 +66,8 @@ def get_factory():
 
 # Show pets with various factories
 if__name__=="__main__":
-shop=PetShop()
 foriinrange(3):
-shop.pet_factory=get_factory()
+shop=PetShop(get_factory())
 shop.show_pet()
 print("="*20)
 

adapter.py

@@ -5,39 +5,28 @@
 
 importos
 
-
 classDog(object):
-
 def__init__(self):
 self.name="Dog"
-
 defbark(self):
 return"woof!"
 
-
 classCat(object):
-
 def__init__(self):
 self.name="Cat"
-
 defmeow(self):
 return"meow!"
 
-
 classHuman(object):
-
 def__init__(self):
 self.name="Human"
-
 defspeak(self):
 return"'hello'"
 
 
 classCar(object):
-
 def__init__(self):
 self.name="Car"
-
 defmake_noise(self, octane_level):
 return"vroom{0}".format("!"*octane_level)
 

chain.py

@@ -3,69 +3,50 @@
 
 """http://www.testingperspective.com/wiki/doku.php/collaboration/chetan/designpatternsinpython/chain-of-responsibilitypattern"""
 
-
 classHandler:
-
-def__init__(self):
-self._successor=None
-
-defsuccessor(self, successor):
-self._successor=successor
-
-defhandle(self, request):
+def__init__(self,successor):
+self._successor=successor;
+defhandle(self,request):
+i=self._handle(request)
+ifnoti:
+self._successor.handle(request)
+def_handle(self, request):
 raiseNotImplementedError('Must provide implementation in subclass.')
 
 
 classConcreteHandler1(Handler):
 
-defhandle(self, request):
+def_handle(self, request):
 if0<request<=10:
 print('request{} handled in handler 1'.format(request))
-elifself._successor:
-self._successor.handle(request)
-
-
+returnTrue
+
 classConcreteHandler2(Handler):
-
-defhandle(self, request):
+
+def_handle(self, request):
 if10<request<=20:
 print('request{} handled in handler 2'.format(request))
-elifself._successor:
-self._successor.handle(request)
-
-
+returnTrue
+
 classConcreteHandler3(Handler):
-
-defhandle(self, request):
+
+def_handle(self, request):
 if20<request<=30:
 print('request{} handled in handler 3'.format(request))
-elifself._successor:
-self._successor.handle(request)
-
-
+returnTrue
 classDefaultHandler(Handler):
-
-defhandle(self, request):
-print('end of chain, no handler for{}'.format(request))
+
+def_handle(self, request):
+print('end of chain, no handler for{}'.format(request))
+returnTrue
 
 
 classClient:
-
 def__init__(self):
-h1=ConcreteHandler1()
-h2=ConcreteHandler2()
-h3=ConcreteHandler3()
-h4=DefaultHandler()
-
-h1.successor(h2)
-h2.successor(h3)
-h3.successor(h4)
-
-self.handlers= (h1, h2, h3, h4,)
-
+self.handler=ConcreteHandler1(ConcreteHandler3(ConcreteHandler2(DefaultHandler(None))))
 defdelegate(self, requests):
 forrequestinrequests:
-self.handlers[0].handle(request)
+self.handler.handle(request)
 
 
 if__name__=="__main__":