Drawing is moved to DrawingActorVisitor

tolmachev_co/actors/actor.py

@@ -1,6 +1,3 @@
 class Actor:
     def accept_visitor(self, visitor):
         raise NotImplementedError("Abstract method is called")
-
-    def draw(self):
-        raise NotImplementedError("Abstract method is called")

tolmachev_co/actors/alcoholic.py

@@ -31,7 +31,4 @@ def make_asleep(self):
 
     def drop_a_bottle(self):
         self.__has_bottle = False
-        return Bottle()
-
-    def draw(self):
-        print 'A',
+        return Bottle()

tolmachev_co/actors/beggar.py

@@ -19,7 +19,4 @@ def is_walking_with_a_bottle(self):
         return self.__current_state == BeggarState.WALKING_WITH_A_BOTTLE
 
     def is_in_tavern(self):
-        return self.__current_state == BeggarState.AT_THE_TAVERN
-
-    def draw(self):
-        print 'B',
+        return self.__current_state == BeggarState.AT_THE_TAVERN

tolmachev_co/actors/bottle.py

@@ -3,6 +3,3 @@
 class Bottle (Actor):
     def accept_visitor(self, visitor):
         visitor.visit_bottle(self)
-
-    def draw(self):
-        print '~',

tolmachev_co/actors/lamp.py

@@ -3,6 +3,3 @@
 class Lamp (Actor):
     def accept_visitor(self, visitor):
         visitor.visit_lamp(self)
-
-    def draw(self):
-        print 'o',

tolmachev_co/actors/pilllar.py

@@ -3,6 +3,3 @@
 class Pillar (Actor):
     def accept_visitor(self, visitor):
         visitor.visit_pillar(self)
-
-    def draw(self):
-        print '|',

tolmachev_co/actors/policeman.py

@@ -20,6 +20,3 @@ def is_walking_to_alcoholic(self):
 
     def is_walking_with_alcoholic(self):
         return self.__current_state == PolicemanState.WALKING_WITH_ALCOHOLIC
-
-    def draw(self):
-        print 'P',

tolmachev_co/actors/tavern.py

@@ -10,9 +10,6 @@ def __init__(self):
     def accept_visitor(self, visitor):
         visitor.visit_tavern(self)
 
-    def draw(self):
-        pass
-
     def is_time_to_generate_alcoholic(self):
         return self.__steps_number_after_alcoholic_generation == 0