From 793d3406681d0594d657a32c9a610cf05f105a44 Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Thu, 19 Dec 2019 11:32:59 -0800
Subject: [PATCH] removed mock from setup.py.in as its not needed in python3,
 added formal script to run coretk gui and remove main line from
 core/gui/app.py

---
 daemon/Pipfile                 |  2 +-
 daemon/core/gui/app.py         | 10 ----------
 daemon/core/gui/graph/graph.py |  4 ++--
 daemon/scripts/coretk-gui      | 14 ++++++++++++++
 daemon/setup.py.in             |  1 -
 5 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100755 daemon/scripts/coretk-gui

diff --git a/daemon/Pipfile b/daemon/Pipfile
index 8066415c..d55b248f 100644
--- a/daemon/Pipfile
+++ b/daemon/Pipfile
@@ -5,7 +5,7 @@ verify_ssl = true
 
 [scripts]
 core = "python scripts/core-daemon -f data/core.conf -l data/logging.conf"
-coretk = "python core/gui/app.py"
+coretk = "python scripts/coretk-gui"
 test = "pytest -v tests"
 test-mock = "pytest -v --mock tests"
 test-emane = "pytest -v tests/emane"
diff --git a/daemon/core/gui/app.py b/daemon/core/gui/app.py
index cbc44930..969292fe 100644
--- a/daemon/core/gui/app.py
+++ b/daemon/core/gui/app.py
@@ -1,4 +1,3 @@
-import logging
 import tkinter as tk
 from tkinter import ttk
 
@@ -96,12 +95,3 @@ class Application(tk.Frame):
 
     def close(self):
         self.master.destroy()
-
-
-if __name__ == "__main__":
-    log_format = "%(asctime)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s"
-    logging.basicConfig(level=logging.DEBUG, format=log_format)
-    Images.load_all()
-    appconfig.check_directory()
-    app = Application()
-    app.mainloop()
diff --git a/daemon/core/gui/graph/graph.py b/daemon/core/gui/graph/graph.py
index 4b481a68..b7220319 100644
--- a/daemon/core/gui/graph/graph.py
+++ b/daemon/core/gui/graph/graph.py
@@ -356,7 +356,7 @@ class CanvasGraph(tk.Canvas):
             return
 
         # edge dst must be a node
-        logging.debug(f"current selected: {self.selected}")
+        logging.debug("current selected: %s", self.selected)
         dst_node = self.nodes.get(self.selected)
         if not dst_node:
             edge.delete()
@@ -631,7 +631,7 @@ class CanvasGraph(tk.Canvas):
             selected = self.get_selected(event)
             canvas_node = self.nodes.get(selected)
             if canvas_node:
-                logging.debug(f"node context: {selected}")
+                logging.debug("node context: %s", selected)
                 self.context = canvas_node.create_context()
                 self.context.post(event.x_root, event.y_root)
         else:
diff --git a/daemon/scripts/coretk-gui b/daemon/scripts/coretk-gui
new file mode 100755
index 00000000..a87df4fc
--- /dev/null
+++ b/daemon/scripts/coretk-gui
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+import logging
+
+from core.gui import appconfig
+from core.gui.app import Application
+from core.gui.images import Images
+
+if __name__ == "__main__":
+    log_format = "%(asctime)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s"
+    logging.basicConfig(level=logging.DEBUG, format=log_format)
+    Images.load_all()
+    appconfig.check_directory()
+    app = Application()
+    app.mainloop()
diff --git a/daemon/setup.py.in b/daemon/setup.py.in
index 8539a1fe..5f3ca41d 100644
--- a/daemon/setup.py.in
+++ b/daemon/setup.py.in
@@ -45,7 +45,6 @@ setup(
     ],
     tests_require=[
         "pytest",
-        "mock",
     ],
     data_files=data_files,
     scripts=glob.glob("scripts/*"),