some refactoring

1 files changed, 5 insertions, 6 deletions

diff --git a/server.py b/server.py
index 26e0f2f..8bb520b 100755
--- a/server.py
+++ b/server.py
@@ -23,16 +23,15 @@ class CreateHandler(BaseHandler):
 class TrialHandler(BaseHandler):
     def is_solved(self):
         return self.solution == self.trial
-    def letter_is_green(self, zip_list, index):
-        return zip_list[index][0] == zip_list[index][1]
+    def letter_is_green(self, index):
+        return self.solution[index] == self.trial[index]
     def letter_is_green_or_yellow(self, zip_list, index):
         char = self.trial[index]
-        shrinked_zip_list = [ c for c in zip_list if c[0] != c[1] ]
-        return [ c[0] for c in shrinked_zip_list ].count(char) >= [ c[1] for c in shrinked_zip_list ][0:index+1].count(char)
+        return [ c[0] for c in zip_list ].count(char) >= [ c[1] for c in zip_list ][0:index+1].count(char)
     def get_colors(self):
-        zip_list = [ c for c in zip(self.solution, self.trial) ]
+        zip_list = [ c for c in zip(self.solution, self.trial) if c[0] != c[1] ]
         return [
-            2 if self.letter_is_green(zip_list, index)
+            2 if self.letter_is_green(index)
             else 1 if self.letter_is_green_or_yellow(zip_list, index)
             else 0
             for index in range(len(self.trial))