Minor refactor

Author: self-init

calculator/api/__init__.py

@@ -0,0 +1 @@
+from .calculator_api import Calculator

calculator/api/calculator.py calculator/api/calculator_api.pycalculator/api/calculator.py renamed to calculator/api/calculator_api.py

@@ -0,0 +1,2 @@
+from .button import CalculatorButtons
+from .display import CalculatorDisplay

calculator/gui/__init__.py

@@ -1,4 +1,4 @@
-from api import calculator as calc
+import api
 import tkinter as tk
 
 LAYOUT_STANDARD = ["AC",  "CE", "%", "/",
@@ -7,12 +7,12 @@
                    "1",   "2",  "3", "+",
                    "+/-", "0",  ".", "="]
 
-def calc_button(root, calculator: calc.Calculator, display_text): 
+def calc_button(root, calculator: api.Calculator, display_text): 
     button = tk.Button(root, text=display_text, command=lambda: calculator.input_button(display_text))
     return button
 
 class CalculatorButtons:
-    def __init__(self, calculator: calc.Calculator):
+    def __init__(self, calculator: api.Calculator):
         self.calculator = calculator
         self.frame = None
         self.buttons = []

calculator/gui/button.py

@@ -1,8 +1,8 @@
-from api import calculator as calc
+import api
 import tkinter as tk
 
 class CalculatorDisplay:
-    def __init__(self, calculator: calc.Calculator):
+    def __init__(self, calculator: api.Calculator):
         self.calculator = calculator
         self.frame = None
         self.upper_entry = None

calculator/gui/display.py

@@ -1,19 +1,19 @@
 import tkinter as tk
-from gui import button, display
-from api import calculator as calc
+import api
+import gui
 
 class App:
     def __init__(self):
-        self.calculator = calc.Calculator()
+        self.calculator = api.Calculator()
         self.window = tk.Tk()
         self.display = None
         self.buttons = None
 
     def create_gui(self):
         self.window.title("Calculator")
 
-        self.display = display.CalculatorDisplay(self.calculator)
-        self.buttons = button.CalculatorButtons(self.calculator)
+        self.display = gui.CalculatorDisplay(self.calculator)
+        self.buttons = gui.CalculatorButtons(self.calculator)
 
         self.display.create_gui(self.window)
         self.buttons.create_gui(self.window)