1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 01:22:19 +03:00

Merge pull request #1284 from A-UNDERSCORE-D/fix/hack-fix-localwebserver

hack to fix --force-localserver-auth
This commit is contained in:
Athanasius 2021-09-24 19:14:47 +01:00 committed by GitHub
commit 4c36f287a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -56,7 +56,6 @@ import killswitch
from config import appversion, appversion_nobuild, config, copyright
# isort: on
from companion import CAPIData, index_possibly_sparse_list
from EDMCLogging import edmclogger, logger, logging
from journal_lock import JournalLock, JournalLockResult
@ -366,7 +365,6 @@ import tkinter.messagebox
from tkinter import ttk
import commodity
import companion
import plug
import prefs
import stats
@ -881,7 +879,7 @@ class AppWindow(object):
self.cooldown()
def export_market_data(self, data: CAPIData) -> bool: # noqa: CCR001
def export_market_data(self, data: 'CAPIData') -> bool: # noqa: CCR001
"""
Export CAPI market data.
@ -1895,6 +1893,11 @@ sys.path: {sys.path}'''
else:
log_locale('After switching to UTF-8 encoding (same language)')
# HACK: n/a | 2021-11-24: --force-localserver-auth does not work if companion is imported early -cont.
# HACK: n/a | 2021-11-24: as we modify config before this is used.
import companion
from companion import CAPIData, index_possibly_sparse_list
# Do this after locale silliness, just in case
if args.forget_frontier_auth:
logger.info("Dropping all fdev tokens as --forget-frontier-auth was passed")