More Linting

Author: makermelissa

PyPortal_Calculator/calculator.py

@@ -1,11 +1,15 @@
 """
-Class that handles the input and calculations
+Class that handles the input_key and calculations
 """
 class Calculator:
     def __init__(self, calc_display, clear_button, label_offset):
         self._calc_display = calc_display
         self._clear_button = clear_button
         self._label_offset = label_offset
+        self._accumulator = "0"
+        self._operator = None
+        self._equal_pressed = False
+        self._operand = None
         self.all_clear()
 
     def calculate(self, number_one, operator, number_two):
@@ -39,63 +43,72 @@ def _set_text(self, text):
     def _get_text(self):
         return self._calc_display.text
 
-    def add_input(self, input):
+    def _handle_number(self, input_key):
+        display_text = self._get_text()
+        if self._operand is None and self._operator is not None:
+            display_text = ""
+        elif self._operand is not None and self._operator is not None and self._equal_pressed:
+            self._accumulator = self._operand
+            self._operator = None
+            self._operand = None
+            display_text = ""
+        elif display_text == "0":
+            display_text = ""
+        display_text += input_key
+        self._set_text(display_text)
+        if self._operator is not None:
+            self._operand = display_text
+        self._set_button_ce(True)
+        self._equal_pressed = False
+
+    def _handle_operator(self, input_key):
+        if input_key == "x":
+            input_key = "*"
+        if self._equal_pressed:
+            self._operand = None
+        if self._operator is None:
+            self._operator = input_key
+        else:
+            # Perform current calculation before changing input_keys
+            if self._operand is not None:
+                self._accumulator = self.calculate(self._accumulator, self._operator, self._operand)
+                self._set_text(self._accumulator)
+            self._operand = None
+            self._operator = input_key
+        self._accumulator = self._get_text()
+        self._equal_pressed = False
+
+    def _handle_equal(self, input_key):
+        if self._operator is not None:
+            if self._operand is None:
+                self._operand = self._get_text()
+            self._accumulator = self.calculate(self._accumulator, self._operator, self._operand)
+        self._set_text(self._accumulator)
+        self._equal_pressed = True
+
+    def add_input(self, input_key):
         try:
-            if input == "AC":
+            if input_key == "AC":
                 self.all_clear()
-            elif input == "CE":
+            elif input_key == "CE":
                 self.clear_entry()
-            elif self._operator is None and input == "0":
+            elif self._operator is None and input_key == "0":
                 pass
-            elif len(input) == 1 and 48 <= ord(input) <= 57:
-                display_text = self._get_text()
-                if self._operand is None and self._operator is not None:
-                    display_text = ""
-                elif self._operand is not None and self._operator is not None and self._equal_pressed:
-                    self._accumulator = self._operand
-                    self._operator = None
-                    self._operand = None
-                    display_text = ""
-                elif display_text == "0":
-                    display_text = ""
-                display_text += input
-                self._set_text(display_text)
-                if self._operator is not None:
-                    self._operand = display_text
-                self._set_button_ce(True)
-                self._equal_pressed = False
-            elif input in ('+', '-', '/', 'x'):
-                if input == "x":
-                    input = "*"
-                if self._equal_pressed:
-                    self._operand = None
-                if self._operator is None:
-                    self._operator = input
-                else:
-                    # Perform current calculation before changing inputs
-                    if self._operand is not None:
-                        self._accumulator = self.calculate(self._accumulator, self._operator, self._operand)
-                        self._set_text(self._accumulator)
-                    self._operand = None
-                    self._operator = input
-                self._accumulator = self._get_text()
-                self._equal_pressed = False
-            elif input == ".":
-                if not input in self._get_text():
-                    self._set_text(self._get_text() + input)
+            elif len(input_key) == 1 and 48 <= ord(input_key) <= 57:
+                self._handle_number(input_key)
+            elif input_key in ('+', '-', '/', 'x'):
+                self._handle_operator(input_key)
+            elif input_key == ".":
+                if not input_key in self._get_text():
+                    self._set_text(self._get_text() + input_key)
                     self._set_button_ce(True)
                     self._equal_pressed = False
-            elif input == "+/-":
+            elif input_key == "+/-":
                 self._set_text(self.calculate(self._get_text(), "*", "-1"))
-            elif input == "%":
+            elif input_key == "%":
                 self._set_text(self.calculate(self._get_text(), "/", "100"))
-            elif input == "=":
-                if self._operator is not None:
-                    if self._operand is None:
-                        self._operand = self._get_text()
-                    self._accumulator = self.calculate(self._accumulator, self._operator, self._operand)
-                self._set_text(self._accumulator)
-                self._equal_pressed = True
+            elif input_key == "=":
+                self._handle_equal(input_key)
         except (ZeroDivisionError, RuntimeError):
             self.all_clear()
             self._set_text("Error")