From 6ecffc465b2af8ed4014842a159208281d5b2ba7 Mon Sep 17 00:00:00 2001
From: Huy Pham <42948410+hpham@users.noreply.github.com>
Date: Wed, 15 Jan 2020 12:59:54 -0800
Subject: [PATCH] wrap up coretk type hinting

---
 daemon/core/emulator/session.py        |  1 +
 daemon/core/gui/dialogs/colorpicker.py |  6 ++----
 daemon/core/gui/dialogs/dialog.py      | 10 +++-------
 daemon/core/gui/dialogs/emaneconfig.py |  4 ++--
 daemon/core/gui/dialogs/marker.py      |  7 ++-----
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/daemon/core/emulator/session.py b/daemon/core/emulator/session.py
index 2634c817..a81ba103 100644
--- a/daemon/core/emulator/session.py
+++ b/daemon/core/emulator/session.py
@@ -772,6 +772,7 @@ class Session:
         Broadcast node location to all listeners.
 
         :param core.nodes.base.NodeBase node: node to broadcast location for
+        :return: nothing
         """
         node_data = NodeData(
             message_type=0,
diff --git a/daemon/core/gui/dialogs/colorpicker.py b/daemon/core/gui/dialogs/colorpicker.py
index 2c7ea62d..8962ea9f 100644
--- a/daemon/core/gui/dialogs/colorpicker.py
+++ b/daemon/core/gui/dialogs/colorpicker.py
@@ -4,7 +4,7 @@ custom color picker
 import logging
 import tkinter as tk
 from tkinter import ttk
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from core.gui.dialogs.dialog import Dialog
 
@@ -13,9 +13,7 @@ if TYPE_CHECKING:
 
 
 class ColorPickerDialog(Dialog):
-    def __init__(
-        self, master: Any, app: "Application", initcolor: Optional[str] = "#000000"
-    ):
+    def __init__(self, master: Any, app: "Application", initcolor: str = "#000000"):
         super().__init__(master, app, "color picker", modal=True)
         self.red_entry = None
         self.blue_entry = None
diff --git a/daemon/core/gui/dialogs/dialog.py b/daemon/core/gui/dialogs/dialog.py
index c349f898..00532793 100644
--- a/daemon/core/gui/dialogs/dialog.py
+++ b/daemon/core/gui/dialogs/dialog.py
@@ -1,6 +1,6 @@
 import tkinter as tk
 from tkinter import ttk
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from core.gui.images import ImageEnum, Images
 from core.gui.themes import DIALOG_PAD
@@ -11,11 +11,7 @@ if TYPE_CHECKING:
 
 class Dialog(tk.Toplevel):
     def __init__(
-        self,
-        master: tk.Widget,
-        app: "Application",
-        title: str,
-        modal: Optional[bool] = False,
+        self, master: tk.Widget, app: "Application", title: str, modal: bool = False
     ):
         super().__init__(master)
         self.withdraw()
@@ -40,7 +36,7 @@ class Dialog(tk.Toplevel):
             self.grab_set()
             self.wait_window()
 
-    def draw_spacer(self, row: Optional[int] = None):
+    def draw_spacer(self, row: int = None):
         frame = ttk.Frame(self.top)
         frame.grid(row=row, sticky="nsew")
         frame.rowconfigure(0, weight=1)
diff --git a/daemon/core/gui/dialogs/emaneconfig.py b/daemon/core/gui/dialogs/emaneconfig.py
index 09ea3cc8..6ef0be78 100644
--- a/daemon/core/gui/dialogs/emaneconfig.py
+++ b/daemon/core/gui/dialogs/emaneconfig.py
@@ -5,7 +5,7 @@ import logging
 import tkinter as tk
 import webbrowser
 from tkinter import ttk
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 import grpc
 
@@ -59,7 +59,7 @@ class EmaneModelDialog(Dialog):
         app: "Application",
         node: core_pb2.Node,
         model: str,
-        interface: Optional[int] = None,
+        interface: int = None,
     ):
         super().__init__(master, app, f"{node.name} {model} Configuration", modal=True)
         self.node = node
diff --git a/daemon/core/gui/dialogs/marker.py b/daemon/core/gui/dialogs/marker.py
index 91de3c96..1db9ca49 100644
--- a/daemon/core/gui/dialogs/marker.py
+++ b/daemon/core/gui/dialogs/marker.py
@@ -4,7 +4,7 @@ marker dialog
 
 import tkinter as tk
 from tkinter import ttk
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from core.gui.dialogs.colorpicker import ColorPickerDialog
 from core.gui.dialogs.dialog import Dialog
@@ -17,10 +17,7 @@ MARKER_THICKNESS = [3, 5, 8, 10]
 
 class MarkerDialog(Dialog):
     def __init__(
-        self,
-        master: "Application",
-        app: "Application",
-        initcolor: Optional[str] = "#000000",
+        self, master: "Application", app: "Application", initcolor: str = "#000000"
     ):
         super().__init__(master, app, "marker tool", modal=False)
         self.app = app