Merge branch 'pep8_bridge' of https://github.com/jcdenton/python-patterns into jcdenton-pep8_bridge

Author: Sakis Kasampalis

bridge.py

@@ -2,32 +2,32 @@
 
 
 # ConcreteImplementor 1/2
-classDrawingAPI1:
-defdrawCircle(self, x, y, radius):
+classDrawingAPI1(object):
+defdraw_circle(self, x, y, radius):
 print('API1.circle at{}:{} radius{}'.format(x, y, radius))
 
 
 # ConcreteImplementor 2/2
-classDrawingAPI2:
-defdrawCircle(self, x, y, radius):
+classDrawingAPI2(object):
+defdraw_circle(self, x, y, radius):
 print('API2.circle at{}:{} radius{}'.format(x, y, radius))
 
 
 # Refined Abstraction
-classCircleShape:
-def__init__(self, x, y, radius, drawingAPI):
-self.__x=x
-self.__y=y
-self.__radius=radius
-self.__drawingAPI=drawingAPI
+classCircleShape(object):
+def__init__(self, x, y, radius, drawing_api):
+self._x=x
+self._y=y
+self._radius=radius
+self._drawing_api=drawing_api
 
 # low-level i.e. Implementation specific
 defdraw(self):
-self.__drawingAPI.drawCircle(self.__x, self.__y, self.__radius)
+self._drawing_api.draw_circle(self._x, self._y, self._radius)
 
 # high-level i.e. Abstraction specific
-defresizeByPercentage(self, pct):
-self.__radius*=pct
+defscale(self, pct):
+self._radius*=pct
 
 
 defmain():
@@ -37,9 +37,9 @@ def main():
  )
 
 forshapeinshapes:
-shape.resizeByPercentage(2.5)
+shape.scale(2.5)
 shape.draw()
 
 
-if__name__=="__main__":
+if__name__=='__main__':
 main()