From 1e5618060ad0f5ed8c81ef56ccaf5cf51bd9df9a Mon Sep 17 00:00:00 2001 From: emdee Date: Thu, 17 Nov 2022 15:26:55 +0000 Subject: [PATCH] isort --- .gitignore | 1 + toxygen/app.py | 52 ++++++++++--------- toxygen/av/calls.py | 20 +++---- toxygen/av/calls_manager.py | 5 +- toxygen/bootstrap/bootstrap.py | 17 +++--- toxygen/contacts/basecontact.py | 7 +-- toxygen/contacts/common.py | 2 +- toxygen/contacts/contact.py | 8 +-- toxygen/contacts/contact_menu.py | 1 + toxygen/contacts/contact_provider.py | 1 + toxygen/contacts/contacts_manager.py | 5 +- toxygen/contacts/friend.py | 5 +- toxygen/contacts/friend_factory.py | 2 +- toxygen/contacts/group_chat.py | 7 +-- toxygen/contacts/group_factory.py | 5 +- toxygen/contacts/profile.py | 4 +- toxygen/file_transfers/file_transfers.py | 10 ++-- .../file_transfers/file_transfers_handler.py | 11 ++-- .../file_transfers_messages_service.py | 3 +- toxygen/groups/groups_service.py | 7 +-- toxygen/groups/peers_list.py | 3 +- toxygen/history/database.py | 4 +- toxygen/history/history.py | 1 + toxygen/history/history_logs_generators.py | 2 +- toxygen/main.py | 23 ++++---- toxygen/messenger/messages.py | 4 +- toxygen/messenger/messenger.py | 5 +- toxygen/middleware/callbacks.py | 16 +++--- toxygen/middleware/threads.py | 10 ++-- toxygen/middleware/tox_factory.py | 12 +++-- toxygen/network/tox_dns.py | 6 ++- toxygen/notifications/sound.py | 9 ++-- toxygen/plugin_support/plugin_support.py | 8 +-- toxygen/plugins/plugin_super_class.py | 7 +-- toxygen/smileys/smileys.py | 5 +- toxygen/stickers/stickers.py | 1 + toxygen/ui/av_widgets.py | 11 ++-- toxygen/ui/contact_items.py | 5 +- toxygen/ui/create_profile_screen.py | 5 +- toxygen/ui/group_bans_widgets.py | 7 +-- toxygen/ui/group_invites_widgets.py | 4 +- toxygen/ui/group_settings_widgets.py | 6 ++- toxygen/ui/groups_widgets.py | 1 + toxygen/ui/login_screen.py | 10 ++-- toxygen/ui/main_screen.py | 17 +++--- toxygen/ui/main_screen_widgets.py | 7 +-- toxygen/ui/menu.py | 11 ++-- toxygen/ui/messages_widgets.py | 13 ++--- toxygen/ui/password_screen.py | 4 +- toxygen/ui/peer_screen.py | 7 +-- toxygen/ui/profile_settings_screen.py | 7 +-- toxygen/ui/self_peer_screen.py | 5 +- toxygen/ui/tray.py | 8 +-- toxygen/ui/widgets.py | 6 ++- toxygen/ui/widgets_factory.py | 13 ++--- toxygen/updater/updater.py | 11 ++-- toxygen/user_data/backup_service.py | 1 + toxygen/user_data/profile_manager.py | 6 +-- toxygen/user_data/settings.py | 14 ++--- toxygen/utils/ui.py | 1 + toxygen/utils/util.py | 8 +-- toxygen/wrapper/tox.py | 8 +-- toxygen/wrapper/toxav.py | 6 ++- toxygen/wrapper/toxencryptsave.py | 3 +- 64 files changed, 290 insertions(+), 204 deletions(-) diff --git a/.gitignore b/.gitignore index 0a8182a..da8f3af 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ Toxygen.egg-info .cache *.db +*.junk diff --git a/toxygen/app.py b/toxygen/app.py index f3e06b4..3b54058 100644 --- a/toxygen/app.py +++ b/toxygen/app.py @@ -1,18 +1,19 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- import os import sys +import threading import traceback from random import shuffle -import threading from time import sleep -from gevent import monkey; monkey.patch_all(); del monkey # noqa import gevent - -from PyQt5 import QtWidgets, QtGui, QtCore +from PyQt5 import QtCore, QtGui, QtWidgets from qtpy.QtCore import QTimer from qtpy.QtWidgets import QApplication +from gevent import monkey; monkey.patch_all(); del monkey # noqa + + try: import coloredlogs if 'COLOREDLOGS_LEVEL_STYLES' not in os.environ: @@ -32,26 +33,16 @@ try: except ImportError: qdarkstyle = None -from middleware import threads +import wrapper_tests.support_testing as ts + import middleware.callbacks as callbacks -import updater.updater as updater -from middleware.tox_factory import tox_factory -import wrapper.toxencryptsave as tox_encrypt_save -import user_data.toxes -from user_data import settings -from user_data.settings import get_user_config_path, merge_args_into_settings -from user_data.settings import Settings -from user_data.profile_manager import ProfileManager - -from plugin_support.plugin_support import PluginLoader - +import styles.style # TODO: dynamic loading import ui.password_screen as password_screen -from ui.login_screen import LoginScreen -from ui.main_screen import MainWindow -from ui import tray - +import updater.updater as updater +import user_data.toxes import utils.ui as util_ui import utils.util as util +import wrapper.toxencryptsave as tox_encrypt_save from av.calls_manager import CallsManager from common.provider import Provider from contacts.contact_provider import ContactProvider @@ -61,23 +52,32 @@ from contacts.group_factory import GroupFactory from contacts.group_peer_factory import GroupPeerFactory from contacts.profile import Profile from file_transfers.file_transfers_handler import FileTransfersHandler -from file_transfers.file_transfers_messages_service import FileTransfersMessagesService +from file_transfers.file_transfers_messages_service import \ + FileTransfersMessagesService from groups.groups_service import GroupsService from history.database import Database from history.history import History from messenger.messenger import Messenger +from middleware import threads +from middleware.tox_factory import tox_factory from network.tox_dns import ToxDns +from plugin_support.plugin_support import PluginLoader from smileys.smileys import SmileyLoader +from ui import tray from ui.create_profile_screen import CreateProfileScreen -from ui.items_factories import MessagesItemsFactory, ContactItemsFactory +from ui.items_factories import ContactItemsFactory, MessagesItemsFactory +from ui.login_screen import LoginScreen +from ui.main_screen import MainWindow from ui.widgets_factory import WidgetsFactory +from user_data import settings from user_data.backup_service import BackupService -import styles.style # TODO: dynamic loading - -import wrapper_tests.support_testing as ts +from user_data.profile_manager import ProfileManager +from user_data.settings import (Settings, get_user_config_path, + merge_args_into_settings) global LOG import logging + LOG = logging.getLogger('app') IDLE_PERIOD = 0.10 @@ -148,6 +148,8 @@ sSTYLE = """ .QToolBar { font-weight: bold; } """ from copy import deepcopy + + class App: def __init__(self, version, oArgs): diff --git a/toxygen/av/calls.py b/toxygen/av/calls.py index 7c3046c..39da327 100644 --- a/toxygen/av/calls.py +++ b/toxygen/av/calls.py @@ -1,22 +1,22 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import pyaudio -import time -import threading import itertools +import threading +import time -from wrapper.toxav_enums import * +import pyaudio +import wrapper_tests.support_testing as ts + +import common.tox_save from av import screen_sharing from av.call import Call -import common.tox_save - -from utils import ui as util_ui -import wrapper_tests.support_testing as ts -from middleware.threads import invoke_in_main_thread from main import sleep -from middleware.threads import BaseThread +from middleware.threads import BaseThread, invoke_in_main_thread +from utils import ui as util_ui +from wrapper.toxav_enums import * global LOG import logging + LOG = logging.getLogger('app.'+__name__) # callbacks can be called in any thread so were being careful def LOG_ERROR(l): print('EROR< '+l) diff --git a/toxygen/av/calls_manager.py b/toxygen/av/calls_manager.py index 12923a2..be2ed33 100644 --- a/toxygen/av/calls_manager.py +++ b/toxygen/av/calls_manager.py @@ -4,13 +4,14 @@ import sys import threading import av.calls -from messenger.messages import * -from ui import av_widgets import common.event as event import utils.ui as util_ui +from messenger.messages import * +from ui import av_widgets global LOG import logging + LOG = logging.getLogger('app.'+__name__) class CallsManager: diff --git a/toxygen/bootstrap/bootstrap.py b/toxygen/bootstrap/bootstrap.py index f80618b..047b6e3 100644 --- a/toxygen/bootstrap/bootstrap.py +++ b/toxygen/bootstrap/bootstrap.py @@ -1,22 +1,27 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- import random import urllib.request + +from PyQt5 import QtCore, QtNetwork + from utils.util import * -from PyQt5 import QtNetwork -from PyQt5 import QtCore + try: - import certifi from io import BytesIO + + import certifi except ImportError: certifi = None -from user_data.settings import get_user_config_path -from wrapper_tests.support_testing import _get_nodes_path -from wrapper_tests.support_http import download_url import wrapper_tests.support_testing as ts +from wrapper_tests.support_http import download_url +from wrapper_tests.support_testing import _get_nodes_path + +from user_data.settings import get_user_config_path global LOG import logging + LOG = logging.getLogger('app.'+'bootstrap') def download_nodes_list(settings, oArgs): diff --git a/toxygen/contacts/basecontact.py b/toxygen/contacts/basecontact.py index ba7daa2..bb5412c 100644 --- a/toxygen/contacts/basecontact.py +++ b/toxygen/contacts/basecontact.py @@ -1,10 +1,11 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from user_data.settings import * from PyQt5 import QtCore, QtGui -from wrapper.toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE -import utils.util as util + import common.event as event import contacts.common as common +import utils.util as util +from user_data.settings import * +from wrapper.toxcore_enums_and_consts import TOX_PUBLIC_KEY_SIZE class BaseContact: diff --git a/toxygen/contacts/common.py b/toxygen/contacts/common.py index 27750a2..1fb7772 100644 --- a/toxygen/contacts/common.py +++ b/toxygen/contacts/common.py @@ -1,6 +1,6 @@ -from pydenticon import Generator import hashlib +from pydenticon import Generator # ----------------------------------------------------------------------------------------------------------------- # Typing notifications diff --git a/toxygen/contacts/contact.py b/toxygen/contacts/contact.py index 83ce315..9fc7f46 100644 --- a/toxygen/contacts/contact.py +++ b/toxygen/contacts/contact.py @@ -1,16 +1,16 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from history.database import TIMEOUT, \ - SAVE_MESSAGES, MESSAGE_AUTHOR +import re from contacts import basecontact, common -from messenger.messages import * from contacts.contact_menu import * from file_transfers import file_transfers as ft -import re +from history.database import MESSAGE_AUTHOR, SAVE_MESSAGES, TIMEOUT +from messenger.messages import * # LOG=util.log global LOG import logging + LOG = logging.getLogger('app.'+__name__) class Contact(basecontact.BaseContact): diff --git a/toxygen/contacts/contact_menu.py b/toxygen/contacts/contact_menu.py index 0e4922e..ca3c1e9 100644 --- a/toxygen/contacts/contact_menu.py +++ b/toxygen/contacts/contact_menu.py @@ -6,6 +6,7 @@ from wrapper.toxcore_enums_and_consts import * global LOG import logging + LOG = logging.getLogger('app') # ----------------------------------------------------------------------------------------------------------------- diff --git a/toxygen/contacts/contact_provider.py b/toxygen/contacts/contact_provider.py index 37ac7c3..fd9585e 100644 --- a/toxygen/contacts/contact_provider.py +++ b/toxygen/contacts/contact_provider.py @@ -4,6 +4,7 @@ import common.tox_save as tox_save global LOG import logging + LOG = logging.getLogger(__name__) # callbacks can be called in any thread so were being careful diff --git a/toxygen/contacts/contacts_manager.py b/toxygen/contacts/contacts_manager.py index cc8a07e..56994ac 100644 --- a/toxygen/contacts/contacts_manager.py +++ b/toxygen/contacts/contacts_manager.py @@ -2,16 +2,17 @@ import traceback +from common.tox_save import ToxSave from contacts.friend import Friend from contacts.group_chat import GroupChat -from messenger.messages import * -from common.tox_save import ToxSave from contacts.group_peer_contact import GroupPeerContact from groups.group_peer import GroupChatPeer +from messenger.messages import * # LOG=util.log global LOG import logging + LOG = logging.getLogger('app.'+__name__) def LOG_ERROR(l): print('ERROR_: '+l) diff --git a/toxygen/contacts/friend.py b/toxygen/contacts/friend.py index 5c8eabb..f5bb7d0 100644 --- a/toxygen/contacts/friend.py +++ b/toxygen/contacts/friend.py @@ -1,7 +1,8 @@ -from contacts import contact, common -from messenger.messages import * import os + +from contacts import common, contact from contacts.contact_menu import * +from messenger.messages import * class Friend(contact.Contact): diff --git a/toxygen/contacts/friend_factory.py b/toxygen/contacts/friend_factory.py index c996c5c..9d661cd 100644 --- a/toxygen/contacts/friend_factory.py +++ b/toxygen/contacts/friend_factory.py @@ -1,5 +1,5 @@ -from contacts.friend import Friend from common.tox_save import ToxSave +from contacts.friend import Friend class FriendFactory(ToxSave): diff --git a/toxygen/contacts/group_chat.py b/toxygen/contacts/group_chat.py index 74ac0e4..1561caf 100644 --- a/toxygen/contacts/group_chat.py +++ b/toxygen/contacts/group_chat.py @@ -1,15 +1,16 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- +import utils.util as util +from common.tox_save import ToxSave from contacts import contact from contacts.contact_menu import GroupMenuGenerator -import utils.util as util +from groups.group_ban import GroupBan from groups.group_peer import GroupChatPeer from wrapper import toxcore_enums_and_consts as constants -from common.tox_save import ToxSave -from groups.group_ban import GroupBan global LOG import logging + LOG = logging.getLogger(__name__) def LOG_ERROR(l): print('ERROR_: '+l) def LOG_WARN(l): print('WARN_: '+l) diff --git a/toxygen/contacts/group_factory.py b/toxygen/contacts/group_factory.py index c1f0985..8ff9d13 100644 --- a/toxygen/contacts/group_factory.py +++ b/toxygen/contacts/group_factory.py @@ -1,11 +1,12 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from contacts.group_chat import GroupChat -from common.tox_save import ToxSave import wrapper.toxcore_enums_and_consts as constants +from common.tox_save import ToxSave +from contacts.group_chat import GroupChat global LOG import logging + LOG = logging.getLogger(__name__) class GroupFactory(ToxSave): diff --git a/toxygen/contacts/profile.py b/toxygen/contacts/profile.py index ed816d9..efe5500 100644 --- a/toxygen/contacts/profile.py +++ b/toxygen/contacts/profile.py @@ -1,14 +1,16 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from contacts import basecontact import random import threading + import common.tox_save as tox_save +from contacts import basecontact from middleware.threads import invoke_in_main_thread iUMAXINT = 4294967295 global LOG import logging + LOG = logging.getLogger('app.'+__name__) class Profile(basecontact.BaseContact, tox_save.ToxSave): diff --git a/toxygen/file_transfers/file_transfers.py b/toxygen/file_transfers/file_transfers.py index 0f04e5b..b980dcb 100644 --- a/toxygen/file_transfers/file_transfers.py +++ b/toxygen/file_transfers/file_transfers.py @@ -1,11 +1,11 @@ -from wrapper.toxcore_enums_and_consts import TOX_FILE_KIND, TOX_FILE_CONTROL -from os.path import basename, getsize, exists, dirname -from os import remove, rename, chdir +from os import chdir, remove, rename +from os.path import basename, dirname, exists, getsize from time import time -from wrapper.tox import Tox + from common.event import Event from middleware.threads import invoke_in_main_thread - +from wrapper.tox import Tox +from wrapper.toxcore_enums_and_consts import TOX_FILE_CONTROL, TOX_FILE_KIND FILE_TRANSFER_STATE = { 'RUNNING': 0, diff --git a/toxygen/file_transfers/file_transfers_handler.py b/toxygen/file_transfers/file_transfers_handler.py index 673b1fe..9404b7a 100644 --- a/toxygen/file_transfers/file_transfers_handler.py +++ b/toxygen/file_transfers/file_transfers_handler.py @@ -1,14 +1,17 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from messenger.messages import * -from ui.contact_items import * +from copy import deepcopy + +from wrapper_tests.support_testing import assert_main_thread + import utils.util as util from common.tox_save import ToxSave -from wrapper_tests.support_testing import assert_main_thread -from copy import deepcopy +from messenger.messages import * +from ui.contact_items import * # LOG=util.log global LOG import logging + LOG = logging.getLogger('app.'+__name__) log = lambda x: LOG.info(x) diff --git a/toxygen/file_transfers/file_transfers_messages_service.py b/toxygen/file_transfers/file_transfers_messages_service.py index d51f748..6dea6a1 100644 --- a/toxygen/file_transfers/file_transfers_messages_service.py +++ b/toxygen/file_transfers/file_transfers_messages_service.py @@ -1,9 +1,10 @@ -from messenger.messenger import * import utils.util as util from file_transfers.file_transfers import * +from messenger.messenger import * global LOG import logging + LOG = logging.getLogger('app.'+__name__) def LOG_ERROR(l): print('ERROR_: '+l) diff --git a/toxygen/groups/groups_service.py b/toxygen/groups/groups_service.py index d329d6d..e2f0ebf 100644 --- a/toxygen/groups/groups_service.py +++ b/toxygen/groups/groups_service.py @@ -2,14 +2,15 @@ import common.tox_save as tox_save import utils.ui as util_ui -from groups.peers_list import PeersListGenerator -from groups.group_invite import GroupInvite import wrapper.toxcore_enums_and_consts as constants -from wrapper.toxcore_enums_and_consts import * +from groups.group_invite import GroupInvite +from groups.peers_list import PeersListGenerator from wrapper.tox import UINT32_MAX +from wrapper.toxcore_enums_and_consts import * global LOG import logging + LOG = logging.getLogger('app.'+'gs') class GroupsService(tox_save.ToxSave): diff --git a/toxygen/groups/peers_list.py b/toxygen/groups/peers_list.py index 17495f5..4ae653d 100644 --- a/toxygen/groups/peers_list.py +++ b/toxygen/groups/peers_list.py @@ -1,7 +1,6 @@ from ui.group_peers_list import PeerItem, PeerTypeItem -from wrapper.toxcore_enums_and_consts import * from ui.widgets import * - +from wrapper.toxcore_enums_and_consts import * # ----------------------------------------------------------------------------------------------------------------- # Builder diff --git a/toxygen/history/database.py b/toxygen/history/database.py index f91e4cc..b679fde 100644 --- a/toxygen/history/database.py +++ b/toxygen/history/database.py @@ -1,10 +1,12 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from sqlite3 import connect import os.path +from sqlite3 import connect + import utils.util as util global LOG import logging + LOG = logging.getLogger('app.db') TIMEOUT = 11 diff --git a/toxygen/history/history.py b/toxygen/history/history.py index caaf91f..43ecdd1 100644 --- a/toxygen/history/history.py +++ b/toxygen/history/history.py @@ -3,6 +3,7 @@ from history.history_logs_generators import * global LOG import logging + LOG = logging.getLogger('app.db') class History: diff --git a/toxygen/history/history_logs_generators.py b/toxygen/history/history_logs_generators.py index b8d0a56..3e9e74d 100644 --- a/toxygen/history/history_logs_generators.py +++ b/toxygen/history/history_logs_generators.py @@ -1,5 +1,5 @@ -from messenger.messages import * import utils.util as util +from messenger.messages import * class HistoryLogsGenerator: diff --git a/toxygen/main.py b/toxygen/main.py index e209469..3e95a80 100644 --- a/toxygen/main.py +++ b/toxygen/main.py @@ -1,21 +1,24 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import sys -import os -import app import argparse -import logging -import signal - import faulthandler +import logging +import os +import signal +import sys + +import app + faulthandler.enable() import warnings + warnings.filterwarnings('ignore') import wrapper_tests.support_testing as ts + try: - from trepan.interfaces import server as Mserver from trepan.api import debug + from trepan.interfaces import server as Mserver except: print('trepan3 TCP server NOT enabled.') else: @@ -25,10 +28,11 @@ else: print('trepan3 TCP server enabled on port 6666.') except: pass +import utils.util as util +from user_data import settings from user_data.settings import * from user_data.settings import Settings -from user_data import settings -import utils.util as util + with ts.ignoreStderr(): import pyaudio @@ -36,6 +40,7 @@ __maintainer__ = 'Ingvar' __version__ = '0.5.0+' import time + sleep = time.sleep def reset(): diff --git a/toxygen/messenger/messages.py b/toxygen/messenger/messages.py index f59978d..4c73fc6 100644 --- a/toxygen/messenger/messages.py +++ b/toxygen/messenger/messages.py @@ -1,7 +1,7 @@ -from history.database import MESSAGE_AUTHOR import os.path -from ui.messages_widgets import * +from history.database import MESSAGE_AUTHOR +from ui.messages_widgets import * MESSAGE_TYPE = { 'TEXT': 0, diff --git a/toxygen/messenger/messenger.py b/toxygen/messenger/messenger.py index 6208df4..28893fa 100644 --- a/toxygen/messenger/messenger.py +++ b/toxygen/messenger/messenger.py @@ -1,13 +1,14 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- +from wrapper_tests.support_testing import assert_main_thread + import common.tox_save as tox_save import utils.ui as util_ui - from messenger.messages import * -from wrapper_tests.support_testing import assert_main_thread from wrapper.toxcore_enums_and_consts import TOX_MAX_MESSAGE_LENGTH global LOG import logging + LOG = logging.getLogger('app.'+__name__) log = lambda x: LOG.info(x) diff --git a/toxygen/middleware/callbacks.py b/toxygen/middleware/callbacks.py index 2aed257..af4dd91 100644 --- a/toxygen/middleware/callbacks.py +++ b/toxygen/middleware/callbacks.py @@ -1,17 +1,19 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import sys import os +import sys import threading +from datetime import datetime + from PyQt5 import QtGui -from wrapper.toxcore_enums_and_consts import * -from wrapper.toxav_enums import * -from wrapper.tox import bin_to_string + import utils.ui as util_ui import utils.util as util -from middleware.threads import invoke_in_main_thread, execute -from notifications.tray import tray_notification +from middleware.threads import execute, invoke_in_main_thread from notifications.sound import * -from datetime import datetime +from notifications.tray import tray_notification +from wrapper.tox import bin_to_string +from wrapper.toxav_enums import * +from wrapper.toxcore_enums_and_consts import * iMAX_INT32 = 4294967295 # callbacks can be called in any thread so were being careful diff --git a/toxygen/middleware/threads.py b/toxygen/middleware/threads.py index 75377dc..00ec753 100644 --- a/toxygen/middleware/threads.py +++ b/toxygen/middleware/threads.py @@ -1,21 +1,23 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- +import queue import sys import threading -import queue +import time + +import wrapper_tests.support_testing as ts from PyQt5 import QtCore from bootstrap.bootstrap import * from bootstrap.bootstrap import download_nodes_list -from wrapper.toxcore_enums_and_consts import TOX_USER_STATUS, TOX_CONNECTION -import wrapper_tests.support_testing as ts from utils import util +from wrapper.toxcore_enums_and_consts import TOX_CONNECTION, TOX_USER_STATUS -import time sleep = time.sleep # LOG=util.log global LOG import logging + LOG = logging.getLogger('app.'+'threads') # log = lambda x: LOG.info(x) diff --git a/toxygen/middleware/tox_factory.py b/toxygen/middleware/tox_factory.py index feba040..29cf449 100644 --- a/toxygen/middleware/tox_factory.py +++ b/toxygen/middleware/tox_factory.py @@ -1,18 +1,22 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- +import ctypes +import os +import traceback + import user_data.settings import wrapper.tox import wrapper.toxcore_enums_and_consts as enums -import ctypes -import traceback -import os global LOG import logging + LOG = logging.getLogger('app.'+'tox_factory') from ctypes import * -from utils import util + from utils import ui as util_ui +from utils import util + # callbacks can be called in any thread so were being careful # tox.py can be called by callbacks diff --git a/toxygen/network/tox_dns.py b/toxygen/network/tox_dns.py index 2de374a..80756d1 100644 --- a/toxygen/network/tox_dns.py +++ b/toxygen/network/tox_dns.py @@ -1,8 +1,11 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- import json import urllib.request + +from PyQt5 import QtCore, QtNetwork + import utils.util as util -from PyQt5 import QtNetwork, QtCore + try: import requests except ImportError: @@ -10,6 +13,7 @@ except ImportError: global LOG import logging + LOG = logging.getLogger('app.'+__name__) class ToxDns: diff --git a/toxygen/notifications/sound.py b/toxygen/notifications/sound.py index a106e80..99567f3 100644 --- a/toxygen/notifications/sound.py +++ b/toxygen/notifications/sound.py @@ -1,10 +1,13 @@ -import utils.util -import wave -import pyaudio import os.path +import wave + +import pyaudio + +import utils.util global LOG import logging + LOG = logging.getLogger('app.'+__name__) SOUND_NOTIFICATION = { diff --git a/toxygen/plugin_support/plugin_support.py b/toxygen/plugin_support/plugin_support.py index 2bb7f40..98c4f8f 100644 --- a/toxygen/plugin_support/plugin_support.py +++ b/toxygen/plugin_support/plugin_support.py @@ -1,14 +1,16 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import utils.util as util -import os import importlib import inspect -import plugins.plugin_super_class as pl +import os import sys +import plugins.plugin_super_class as pl +import utils.util as util + # LOG=util.log global LOG import logging + LOG = logging.getLogger('plugin_support') def trace(msg, *args, **kwargs): LOG._log(0, msg, []) LOG.trace = trace diff --git a/toxygen/plugins/plugin_super_class.py b/toxygen/plugins/plugin_super_class.py index 0056d36..f5d9f5c 100644 --- a/toxygen/plugins/plugin_super_class.py +++ b/toxygen/plugins/plugin_super_class.py @@ -1,8 +1,9 @@ import os -from PyQt5 import QtCore, QtWidgets -import utils.ui as util_ui -import common.tox_save as tox_save +from PyQt5 import QtCore, QtWidgets + +import common.tox_save as tox_save +import utils.ui as util_ui MAX_SHORT_NAME_LENGTH = 5 diff --git a/toxygen/smileys/smileys.py b/toxygen/smileys/smileys.py index 43ae3fd..b6a9f50 100644 --- a/toxygen/smileys/smileys.py +++ b/toxygen/smileys/smileys.py @@ -1,12 +1,15 @@ -from utils import util import json import os from collections import OrderedDict + from PyQt5 import QtCore +from utils import util + # LOG=util.log global LOG import logging + LOG = logging.getLogger('app.'+__name__) log = lambda x: LOG.info(x) diff --git a/toxygen/stickers/stickers.py b/toxygen/stickers/stickers.py index 14142c7..0e82f62 100644 --- a/toxygen/stickers/stickers.py +++ b/toxygen/stickers/stickers.py @@ -1,4 +1,5 @@ import os + import utils.util as util diff --git a/toxygen/ui/av_widgets.py b/toxygen/ui/av_widgets.py index 717b022..d321911 100644 --- a/toxygen/ui/av_widgets.py +++ b/toxygen/ui/av_widgets.py @@ -1,15 +1,16 @@ import threading - -from PyQt5 import QtCore, QtGui, QtWidgets -import pyaudio import wave -from ui import widgets -import utils.util as util +import pyaudio import wrapper_tests.support_testing as ts +from PyQt5 import QtCore, QtGui, QtWidgets + +import utils.util as util +from ui import widgets global LOG import logging + LOG = logging.getLogger('app.'+__name__) class IncomingCallWidget(widgets.CenteredWidget): diff --git a/toxygen/ui/contact_items.py b/toxygen/ui/contact_items.py index 98a1dcd..99190a5 100644 --- a/toxygen/ui/contact_items.py +++ b/toxygen/ui/contact_items.py @@ -1,7 +1,8 @@ -from wrapper.toxcore_enums_and_consts import * from PyQt5 import QtCore, QtGui, QtWidgets -from utils.util import * + from ui.widgets import DataLabel +from utils.util import * +from wrapper.toxcore_enums_and_consts import * class ContactItem(QtWidgets.QWidget): diff --git a/toxygen/ui/create_profile_screen.py b/toxygen/ui/create_profile_screen.py index 512c141..4755a04 100644 --- a/toxygen/ui/create_profile_screen.py +++ b/toxygen/ui/create_profile_screen.py @@ -1,7 +1,8 @@ -from ui.widgets import * from PyQt5 import uic -import utils.util as util + import utils.ui as util_ui +import utils.util as util +from ui.widgets import * class CreateProfileScreenResult: diff --git a/toxygen/ui/group_bans_widgets.py b/toxygen/ui/group_bans_widgets.py index f1ec3cf..5d32f2e 100644 --- a/toxygen/ui/group_bans_widgets.py +++ b/toxygen/ui/group_bans_widgets.py @@ -1,7 +1,8 @@ -from ui.widgets import CenteredWidget -from PyQt5 import uic, QtWidgets, QtCore -import utils.util as util +from PyQt5 import QtCore, QtWidgets, uic + import utils.ui as util_ui +import utils.util as util +from ui.widgets import CenteredWidget class GroupBanItem(QtWidgets.QWidget): diff --git a/toxygen/ui/group_invites_widgets.py b/toxygen/ui/group_invites_widgets.py index ff61370..360a8fe 100644 --- a/toxygen/ui/group_invites_widgets.py +++ b/toxygen/ui/group_invites_widgets.py @@ -1,9 +1,11 @@ -from PyQt5 import uic, QtWidgets +from PyQt5 import QtWidgets, uic + import utils.util as util from ui.widgets import * global LOG import logging + LOG = logging.getLogger('app') class GroupInviteItem(QtWidgets.QWidget): diff --git a/toxygen/ui/group_settings_widgets.py b/toxygen/ui/group_settings_widgets.py index 45b0ad6..574dba1 100644 --- a/toxygen/ui/group_settings_widgets.py +++ b/toxygen/ui/group_settings_widgets.py @@ -1,7 +1,9 @@ -from ui.widgets import CenteredWidget from PyQt5 import uic -import utils.util as util + import utils.ui as util_ui +import utils.util as util +from ui.widgets import CenteredWidget + class GroupManagementScreen(CenteredWidget): diff --git a/toxygen/ui/groups_widgets.py b/toxygen/ui/groups_widgets.py index ad4b703..5470a12 100644 --- a/toxygen/ui/groups_widgets.py +++ b/toxygen/ui/groups_widgets.py @@ -1,4 +1,5 @@ from PyQt5 import uic + import utils.util as util from ui.widgets import * from wrapper.toxcore_enums_and_consts import * diff --git a/toxygen/ui/login_screen.py b/toxygen/ui/login_screen.py index 35e33b5..0cdcf1c 100644 --- a/toxygen/ui/login_screen.py +++ b/toxygen/ui/login_screen.py @@ -1,9 +1,11 @@ -from ui.widgets import * -from PyQt5 import uic -import utils.util as util -import utils.ui as util_ui import os.path +from PyQt5 import uic + +import utils.ui as util_ui +import utils.util as util +from ui.widgets import * + class LoginScreenResult: diff --git a/toxygen/ui/main_screen.py b/toxygen/ui/main_screen.py index d716d15..71489ad 100644 --- a/toxygen/ui/main_screen.py +++ b/toxygen/ui/main_screen.py @@ -1,16 +1,15 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import os import logging +import os -from PyQt5 import uic -from PyQt5 import QtWidgets, QtGui -from qtpy.QtGui import (QColor, QTextCharFormat, QFont, QSyntaxHighlighter) +from PyQt5 import QtGui, QtWidgets, uic +from qtpy.QtGui import QColor, QFont, QSyntaxHighlighter, QTextCharFormat -from ui.contact_items import * -from ui.widgets import MultilineEdit -from ui.main_screen_widgets import * -import utils.util as util import utils.ui as util_ui +import utils.util as util +from ui.contact_items import * +from ui.main_screen_widgets import * +from ui.widgets import MultilineEdit from user_data.settings import Settings global LOG @@ -20,8 +19,8 @@ iMAX = 70 try: # https://github.com/pyqtconsole/pyqtconsole - from pyqtconsole.console import PythonConsole import pyqtconsole.highlighter as hl + from pyqtconsole.console import PythonConsole except Exception as e: LOG.warn(e) PythonConsole = None diff --git a/toxygen/ui/main_screen_widgets.py b/toxygen/ui/main_screen_widgets.py index a2dc110..de124b0 100644 --- a/toxygen/ui/main_screen_widgets.py +++ b/toxygen/ui/main_screen_widgets.py @@ -1,14 +1,15 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import urllib import re +import urllib from PyQt5 import QtCore, QtGui, QtWidgets -from ui.widgets import RubberBandWindow, create_menu, QRightClickButton, CenteredWidget, LineEdit -import utils.util as util import utils.ui as util_ui +import utils.util as util from stickers.stickers import load_stickers +from ui.widgets import (CenteredWidget, LineEdit, QRightClickButton, + RubberBandWindow, create_menu) class MessageArea(QtWidgets.QPlainTextEdit): diff --git a/toxygen/ui/menu.py b/toxygen/ui/menu.py index a749ab6..dd21575 100644 --- a/toxygen/ui/menu.py +++ b/toxygen/ui/menu.py @@ -1,17 +1,18 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from PyQt5 import QtCore, QtGui, QtWidgets, uic import pyaudio +import wrapper_tests.support_testing as ts +from PyQt5 import QtCore, QtGui, QtWidgets, uic -from user_data.settings import * -from utils.util import * -from ui.widgets import CenteredWidget, DataLabel, LineEdit, RubberBandWindow import updater.updater as updater import utils.ui as util_ui -import wrapper_tests.support_testing as ts +from ui.widgets import CenteredWidget, DataLabel, LineEdit, RubberBandWindow from user_data import settings +from user_data.settings import * +from utils.util import * global LOG import logging + LOG = logging.getLogger('app.'+__name__) global oPYA diff --git a/toxygen/ui/messages_widgets.py b/toxygen/ui/messages_widgets.py index bf4da13..bb09132 100644 --- a/toxygen/ui/messages_widgets.py +++ b/toxygen/ui/messages_widgets.py @@ -1,12 +1,13 @@ -from wrapper.toxcore_enums_and_consts import * -import ui.widgets as widgets -import utils.util as util -import ui.menu as menu import html as h import re -from ui.widgets import * -from messenger.messages import MESSAGE_AUTHOR + +import ui.menu as menu +import ui.widgets as widgets +import utils.util as util from file_transfers.file_transfers import * +from messenger.messages import MESSAGE_AUTHOR +from ui.widgets import * +from wrapper.toxcore_enums_and_consts import * class MessageBrowser(QtWidgets.QTextBrowser): diff --git a/toxygen/ui/password_screen.py b/toxygen/ui/password_screen.py index 1e38964..7060a78 100644 --- a/toxygen/ui/password_screen.py +++ b/toxygen/ui/password_screen.py @@ -1,9 +1,11 @@ -from ui.widgets import CenteredWidget, LineEdit, DialogWithResult from PyQt5 import QtCore, QtWidgets + import utils.ui as util_ui +from ui.widgets import CenteredWidget, DialogWithResult, LineEdit global LOG import logging + LOG = logging.getLogger('app.'+__name__) class PasswordArea(LineEdit): diff --git a/toxygen/ui/peer_screen.py b/toxygen/ui/peer_screen.py index 1d23f7e..b26649b 100644 --- a/toxygen/ui/peer_screen.py +++ b/toxygen/ui/peer_screen.py @@ -1,9 +1,10 @@ -from ui.widgets import CenteredWidget from PyQt5 import uic -import utils.util as util + import utils.ui as util_ui -from ui.contact_items import * +import utils.util as util import wrapper.toxcore_enums_and_consts as consts +from ui.contact_items import * +from ui.widgets import CenteredWidget class PeerScreen(CenteredWidget): diff --git a/toxygen/ui/profile_settings_screen.py b/toxygen/ui/profile_settings_screen.py index 8e20211..fd36b0b 100644 --- a/toxygen/ui/profile_settings_screen.py +++ b/toxygen/ui/profile_settings_screen.py @@ -1,8 +1,9 @@ -from ui.widgets import CenteredWidget +from PyQt5 import QtCore, QtGui, uic + import utils.ui as util_ui -from utils.util import join_path, get_images_directory, get_views_path +from ui.widgets import CenteredWidget from user_data.settings import Settings -from PyQt5 import QtGui, QtCore, uic +from utils.util import get_images_directory, get_views_path, join_path class ProfileSettings(CenteredWidget): diff --git a/toxygen/ui/self_peer_screen.py b/toxygen/ui/self_peer_screen.py index cf252d3..7f997ea 100644 --- a/toxygen/ui/self_peer_screen.py +++ b/toxygen/ui/self_peer_screen.py @@ -1,8 +1,9 @@ -from ui.widgets import CenteredWidget, LineEdit from PyQt5 import uic -import utils.util as util + import utils.ui as util_ui +import utils.util as util from ui.contact_items import * +from ui.widgets import CenteredWidget, LineEdit class SelfPeerScreen(CenteredWidget): diff --git a/toxygen/ui/tray.py b/toxygen/ui/tray.py index 3bfc7f3..1a2bfce 100644 --- a/toxygen/ui/tray.py +++ b/toxygen/ui/tray.py @@ -1,8 +1,10 @@ -from PyQt5 import QtWidgets, QtGui, QtCore +import os.path + +from PyQt5 import QtCore, QtGui, QtWidgets + +from ui.password_screen import UnlockAppScreen from utils.ui import tr from utils.util import * -from ui.password_screen import UnlockAppScreen -import os.path class SystemTrayIcon(QtWidgets.QSystemTrayIcon): diff --git a/toxygen/ui/widgets.py b/toxygen/ui/widgets.py index 8789ad1..43d8021 100644 --- a/toxygen/ui/widgets.py +++ b/toxygen/ui/widgets.py @@ -1,8 +1,10 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from PyQt5 import QtCore, QtGui, QtWidgets -import utils.ui as util_ui import logging +from PyQt5 import QtCore, QtGui, QtWidgets + +import utils.ui as util_ui + global LOG LOG = logging.getLogger('app') diff --git a/toxygen/ui/widgets_factory.py b/toxygen/ui/widgets_factory.py index 0c8fd08..c713ea4 100644 --- a/toxygen/ui/widgets_factory.py +++ b/toxygen/ui/widgets_factory.py @@ -1,13 +1,14 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from ui.main_screen_widgets import * -from ui.menu import * -from ui.groups_widgets import * -from ui.peer_screen import * -from ui.self_peer_screen import * +from ui.group_bans_widgets import * from ui.group_invites_widgets import * from ui.group_settings_widgets import * -from ui.group_bans_widgets import * +from ui.groups_widgets import * +from ui.main_screen_widgets import * +from ui.menu import * +from ui.peer_screen import * from ui.profile_settings_screen import ProfileSettings +from ui.self_peer_screen import * + class WidgetsFactory: diff --git a/toxygen/updater/updater.py b/toxygen/updater/updater.py index 2311282..85f7dca 100644 --- a/toxygen/updater/updater.py +++ b/toxygen/updater/updater.py @@ -1,14 +1,17 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import utils.util as util -import utils.ui as util_ui import os import platform -import urllib -from PyQt5 import QtNetwork, QtCore import subprocess +import urllib + +from PyQt5 import QtCore, QtNetwork + +import utils.ui as util_ui +import utils.util as util global LOG import logging + LOG = logging.getLogger('app.'+__name__) log = lambda x: LOG.info(x) diff --git a/toxygen/user_data/backup_service.py b/toxygen/user_data/backup_service.py index bb0cef9..a74cf73 100644 --- a/toxygen/user_data/backup_service.py +++ b/toxygen/user_data/backup_service.py @@ -1,4 +1,5 @@ import os.path + from utils.util import get_profile_name_from_path, join_path diff --git a/toxygen/user_data/profile_manager.py b/toxygen/user_data/profile_manager.py index 6d7329f..8a44a3c 100644 --- a/toxygen/user_data/profile_manager.py +++ b/toxygen/user_data/profile_manager.py @@ -1,13 +1,13 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -import utils.util as util import os -from user_data.settings import Settings +import utils.util as util from common.event import Event -from user_data.settings import get_user_config_path +from user_data.settings import Settings, get_user_config_path global LOG import logging + LOG = logging.getLogger('app.'+__name__) diff --git a/toxygen/user_data/settings.py b/toxygen/user_data/settings.py index ca75f8f..06f52e2 100644 --- a/toxygen/user_data/settings.py +++ b/toxygen/user_data/settings.py @@ -1,20 +1,22 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- +import json import os from platform import system -import json from pprint import pprint -from utils.util import * -from utils.util import log, join_path -from common.event import Event +import wrapper_tests.support_testing as ts + +import user_data import utils.ui as util_ui import utils.util as util_utils -import user_data -import wrapper_tests.support_testing as ts +from common.event import Event +from utils.util import * +from utils.util import join_path, log global LOG import logging + LOG = logging.getLogger('settings') def merge_args_into_settings(args, settings): diff --git a/toxygen/utils/ui.py b/toxygen/utils/ui.py index d2d7122..f26cad1 100644 --- a/toxygen/utils/ui.py +++ b/toxygen/utils/ui.py @@ -1,4 +1,5 @@ from PyQt5 import QtWidgets + import utils.util as util diff --git a/toxygen/utils/util.py b/toxygen/utils/util.py index 7a98174..6bb0150 100644 --- a/toxygen/utils/util.py +++ b/toxygen/utils/util.py @@ -1,11 +1,11 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- +import datetime import os -import time +import platform +import re import shutil import sys -import re -import platform -import datetime +import time def cached(func): diff --git a/toxygen/wrapper/tox.py b/toxygen/wrapper/tox.py index ece67fb..4d9d48c 100644 --- a/toxygen/wrapper/tox.py +++ b/toxygen/wrapper/tox.py @@ -3,13 +3,13 @@ from ctypes import * from datetime import datetime try: - from wrapper.toxcore_enums_and_consts import * - from wrapper.toxav import ToxAV from wrapper.libtox import LibToxCore + from wrapper.toxav import ToxAV + from wrapper.toxcore_enums_and_consts import * except: - from toxcore_enums_and_consts import * - from toxav import ToxAV from libtox import LibToxCore + from toxav import ToxAV + from toxcore_enums_and_consts import * def LOG_ERROR(a): print('EROR> '+a) def LOG_WARN(a): print('WARN> '+a) diff --git a/toxygen/wrapper/toxav.py b/toxygen/wrapper/toxav.py index 9fbe96c..d4ac38c 100644 --- a/toxygen/wrapper/toxav.py +++ b/toxygen/wrapper/toxav.py @@ -1,11 +1,13 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from ctypes import c_int, POINTER, c_void_p, byref, ArgumentError, c_uint32, CFUNCTYPE, c_size_t, c_uint8, c_uint16 -from ctypes import c_char_p, c_int32, c_bool, cast +from ctypes import (CFUNCTYPE, POINTER, ArgumentError, byref, c_bool, c_char_p, + c_int, c_int32, c_size_t, c_uint8, c_uint16, c_uint32, + c_void_p, cast) from wrapper.libtox import LibToxAV from wrapper.toxav_enums import * + def LOG_ERROR(a): print('EROR> '+a) def LOG_WARN(a): print('WARN> '+a) def LOG_INFO(a): print('INFO> '+a) diff --git a/toxygen/wrapper/toxencryptsave.py b/toxygen/wrapper/toxencryptsave.py index a5955d5..36118e8 100644 --- a/toxygen/wrapper/toxencryptsave.py +++ b/toxygen/wrapper/toxencryptsave.py @@ -1,6 +1,7 @@ # -*- mode: python; indent-tabs-mode: nil; py-indent-offset: 4; coding: utf-8 -*- -from ctypes import c_size_t, create_string_buffer, byref, c_int, ArgumentError, c_char_p, c_bool +from ctypes import (ArgumentError, byref, c_bool, c_char_p, c_int, c_size_t, + create_string_buffer) try: from wrapper import libtox