Merge pull request cundi#6 from caimaoy/bug-fix-modify-words

修改笔误

Author: cundi

第二章-构造器模式.md

@@ -56,7 +56,7 @@ to return the final object when it needs it [GOF95, page 113], [j.mp/builderpat]
 
 The new computer analogy might help to distinguish between a Builder pattern and a Factory pattern. Assume that you want to buy a new computer. If you decide to buy a specific preconfigured computer model, for example, the latest Apple 1.4 GHz Mac mini, you use the Factory pattern. All the hardware specifications are already predefined by the manufacturer, who knows what to do without consulting you. The manufacturer typically receives just a single instruction. Code-wise, this would look like the following (*apple-factory.py*):  
 
-新计算机的分析有助于区别构造器模式和工厂模式。假设你需要买一台新电脑。如果你决定买预先配置好的电脑，例如最新的Apple 1.4Ghz Mac mini，你使用的是工厂模式。所有硬件规格都已经由厂商预定义了，厂家不用问你也知道该干什么。厂商通畅只会收到一条指令。代码使人明了，其内容如下（*apple-factory.py*）：  
+新计算机的分析有助于区别构造器模式和工厂模式。假设你需要买一台新电脑。如果你决定买预先配置好的电脑，例如最新的Apple 1.4Ghz Mac mini，你使用的是工厂模式。所有硬件规格都已经由厂商预定义了，厂家不用问你也知道该干什么。厂商通常只会收到一条指令。代码使人明了，其内容如下（*apple-factory.py*）：  
 
 ```python
 MINI14 = '1.4GHz Mac mini'
@@ -183,7 +183,7 @@ not supposed to be instantiated directly. A builder creates an instance of the e
 - To clarify the fact that the end product is typically minimal does not mean that you should never assign it any responsibilities  
 - To promote code reuse through composition [GOF95, page 32]  
 
-- 要说明的是，终端产品通畅是最小化的，但是这并不意味着你从此就不能让它承担任何的职责
+- 要说明的是，终端产品通常是最小化的，但是这并不意味着你从此就不能让它承担任何的职责
 - 通过使用合成来提升代码的复用性
 
 ```python
@@ -360,7 +360,6 @@ class MargaritaBuilder:
         self.pizza = Pizza('margarita')
         self.progress = PizzaProgress.queued
         self.baking_time = 5      # in seconds for the sake of the
-        example
 
     def prepare_dough(self):
         self.progress = PizzaProgress.preparation
@@ -402,53 +401,53 @@ class CreamyBaconBuilder:
         self.pizza = Pizza('creamy bacon')
         self.progress = PizzaProgress.queued
         self.baking_time = 7      # in seconds for the sake of the
-        example
 
     def prepare_dough(self):
-           self.progress = PizzaProgress.preparation
-           self.pizza.prepare_dough(PizzaDough.thick)
+        self.progress = PizzaProgress.preparation
+        self.pizza.prepare_dough(PizzaDough.thick)
 
     def add_sauce(self):
-           print('adding the crème fraîche sauce to your creamy bacon')
-           self.pizza.sauce = PizzaSauce.creme_fraiche
-           time.sleep(STEP_DELAY)
-           print('done with the crème fraîche sauce')
+        print('adding the crème fraîche sauce to your creamy bacon')
+        self.pizza.sauce = PizzaSauce.creme_fraiche
+        time.sleep(STEP_DELAY)
+        print('done with the crème fraîche sauce')
 
     def add_topping(self):
-           print('adding the topping (mozzarella, bacon, ham, mushrooms, red onion, oregano) to your creamy bacon')
-           self.pizza.topping.append([t for t in
-           (PizzaTopping.mozzarella, PizzaTopping.bacon,
-           PizzaTopping.ham,PizzaTopping.mushrooms,
-           PizzaTopping.red_onion, PizzaTopping.oregano)])
-           time.sleep(STEP_DELAY)
-           print('done with the topping (mozzarella, bacon, ham, mushrooms, red onion, oregano)')
+        print('adding the topping (mozzarella, bacon, ham, mushrooms, red onion, oregano) to your creamy bacon')
+        self.pizza.topping.append([t for t in
+        (PizzaTopping.mozzarella, PizzaTopping.bacon,
+        PizzaTopping.ham,PizzaTopping.mushrooms,
+        PizzaTopping.red_onion, PizzaTopping.oregano)])
+        time.sleep(STEP_DELAY)
+        print('done with the topping (mozzarella, bacon, ham, mushrooms, red onion, oregano)')
 
     def bake(self):
-           self.progress = PizzaProgress.baking
-           print('baking your creamy bacon for {} seconds'.format(self.baking_time))
-           time.sleep(self.baking_time)
-           self.progress = PizzaProgress.ready
-           print('your creamy bacon is ready')
+        self.progress = PizzaProgress.baking
+        print('baking your creamy bacon for {} seconds'.format(self.baking_time))
+        time.sleep(self.baking_time)
+        self.progress = PizzaProgress.ready
+        print('your creamy bacon is ready')
 
 
-  class Waiter:
-       def __init__(self):
-           self.builder = None
-       def construct_pizza(self, builder):
-           self.builder = builder
-           [step() for step in (builder.prepare_dough,
-           builder.add_sauce, builder.add_topping, builder.bake)]
-       @property
-       def pizza(self):
-           return self.builder.pizza
-           
-        def validate_style(builders):
-    try:
-        pizza_style = input('What pizza would you like, [m]argarita or [c]reamy bacon? ')uilder = builders[pizza_style]() valid_input = True
-       except KeyError as err:
-           print('Sorry, only margarita (key m) and creamy bacon (key c) are available')
-           return (False, None)
-       return (True, builder)
+class Waiter:
+    def __init__(self):
+        self.builder = None
+    def construct_pizza(self, builder):
+        self.builder = builder
+        [step() for step in (builder.prepare_dough,
+        builder.add_sauce, builder.add_topping, builder.bake)]
+    @property
+    def pizza(self):
+        return self.builder.pizza
+    def validate_style(builders):
+        try:
+            pizza_style = input('What pizza would you like,[m]argarita or [c]reamy bacon? ')
+            builder = builders[pizza_style]()
+            valid_input = True
+        except KeyError as err:
+            print('Sorry, only margarita (key m) and creamy bacon (key c) are available')
+            return (False, None)
+        return (True, builder)
 
 
 def main():