From 2e58d106bd9f7281a82caf0447b8915130bca6e6 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 24 Jul 2020 22:23:40 +0100
Subject: [PATCH] logging.getLogger(appname) instead of import from
 EDMarketConnector

Using:

from EDMarketConnector import logger

causes issues if EDMarketConnector is already importing 'this' file.

So just get a logger using logger.getLogger(appname) instead.
`from config import appname` if needs be.
---
 plug.py          | 8 ++++----
 plugins/eddn.py  | 5 +++--
 plugins/edsm.py  | 3 ++-
 plugins/inara.py | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plug.py b/plug.py
index 01694520..50d9af07 100644
--- a/plug.py
+++ b/plug.py
@@ -8,15 +8,15 @@ import importlib
 import sys
 import operator
 import threading	# We don't use it, but plugins might
-from traceback import print_exc
-
+import logging
 import tkinter as tk
+
 import myNotebook as nb
 
-from config import config
-from EDMarketConnector import logger
+from config import config, appname
 from time import time as time
 
+logger = logging.getLogger(appname)
 
 # Dashboard Flags constants
 FlagsDocked = 1<<0		# on a landing pad
diff --git a/plugins/eddn.py b/plugins/eddn.py
index 5853cb13..e2e2b141 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -9,20 +9,21 @@ import re
 import requests
 import sys
 import uuid
+import logging
 
 import tkinter as tk
 from ttkHyperlinkLabel import HyperlinkLabel
 import myNotebook as nb
 
 from prefs import prefsVersion
-from EDMarketConnector import logger
 
 if sys.platform != 'win32':
     from fcntl import lockf, LOCK_EX, LOCK_NB
 
-from config import applongname, appversion, config
+from config import appname, applongname, appversion, config
 from companion import category_map
 
+logger = logging.getLogger(appname)
 
 this = sys.modules[__name__]	# For holding module globals
 
diff --git a/plugins/edsm.py b/plugins/edsm.py
index ff29e099..eb0ab84f 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -18,15 +18,16 @@ import time
 import urllib.request, urllib.error, urllib.parse
 from queue import Queue
 from threading import Thread
+import logging
 
 import tkinter as tk
 from ttkHyperlinkLabel import HyperlinkLabel
 import myNotebook as nb
 
-from EDMarketConnector import logger
 from config import appname, applongname, appversion, config
 import plug
 
+logger = logging.getLogger(appname)
 
 EDSM_POLL = 0.1
 _TIMEOUT = 20
diff --git a/plugins/inara.py b/plugins/inara.py
index 1fcf5911..abf221f4 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -10,14 +10,15 @@ import time
 from operator import itemgetter
 from queue import Queue
 from threading import Thread
+import logging
 
 import tkinter as tk
 from ttkHyperlinkLabel import HyperlinkLabel
 import myNotebook as nb
 
-from EDMarketConnector import logger
 from config import appname, applongname, appversion, config
 import plug
+logger = logging.getLogger(appname)
 
 
 _TIMEOUT = 20