From 35a926f6040fc17375ee247d9f74d3317e010d1e Mon Sep 17 00:00:00 2001 From: shekhar-cis Date: Fri, 26 Aug 2022 17:47:43 +0530 Subject: [PATCH] Update logging imports --- src/bitmessagekivy/baseclass/addressbook.py | 6 ++++-- src/bitmessagekivy/baseclass/login.py | 5 +++-- src/bitmessagekivy/baseclass/maildetail.py | 6 +++--- src/bitmessagekivy/baseclass/network.py | 4 ++-- src/bitmessagekivy/baseclass/popup.py | 7 ++++--- src/bitmessagekivy/baseclass/qrcode.py | 5 ++++- src/bitmessagekivy/baseclass/scan_screen.py | 11 ++++++----- src/bitmessagekivy/uikivysignaler.py | 10 +++++++--- 8 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/bitmessagekivy/baseclass/addressbook.py b/src/bitmessagekivy/baseclass/addressbook.py index 0b3386eb..26681383 100644 --- a/src/bitmessagekivy/baseclass/addressbook.py +++ b/src/bitmessagekivy/baseclass/addressbook.py @@ -10,6 +10,7 @@ All saved addresses are managed in Addressbook """ import os +import logging from functools import partial from kivy.clock import Clock @@ -28,8 +29,9 @@ from pybitmessage.bitmessagekivy.baseclass.common import ( ) from pybitmessage.bitmessagekivy.baseclass.popup import SavedAddressDetailPopup from pybitmessage.bitmessagekivy.baseclass.addressbook_widgets import HelperAddressBook -from debug import logger -from helper_sql import sqlExecute +from pybitmessage.helper_sql import sqlExecute + +logger = logging.getLogger('default') class AddressBook(Screen, HelperAddressBook): diff --git a/src/bitmessagekivy/baseclass/login.py b/src/bitmessagekivy/baseclass/login.py index a3862e68..c9143787 100644 --- a/src/bitmessagekivy/baseclass/login.py +++ b/src/bitmessagekivy/baseclass/login.py @@ -12,10 +12,11 @@ from kivy.uix.boxlayout import BoxLayout from kivy.uix.screenmanager import Screen from kivy.app import App -from backend.address_generator import AddressGenerator # pylint: disable=import-error from kivymd.uix.behaviors.elevation import RectangularElevationBehavior + +from pybitmessage.backend.address_generator import AddressGenerator from pybitmessage.bitmessagekivy.baseclass.common import toast -from bmconfigparser import config +from pybitmessage.bmconfigparser import config class Login(Screen): diff --git a/src/bitmessagekivy/baseclass/maildetail.py b/src/bitmessagekivy/baseclass/maildetail.py index a4913f26..a8a28066 100644 --- a/src/bitmessagekivy/baseclass/maildetail.py +++ b/src/bitmessagekivy/baseclass/maildetail.py @@ -30,9 +30,9 @@ from pybitmessage.bitmessagekivy.baseclass.common import ( ) from pybitmessage.bitmessagekivy.baseclass.popup import SenderDetailPopup from pybitmessage.bitmessagekivy.get_platform import platform -from helper_sql import sqlQuery -from helper_sent import delete, retrieve_message_details -from helper_inbox import trash +from pybitmessage.helper_sql import sqlQuery +from pybitmessage.helper_sent import delete, retrieve_message_details +from pybitmessage.helper_inbox import trash class OneLineListTitle(OneLineListItem): diff --git a/src/bitmessagekivy/baseclass/network.py b/src/bitmessagekivy/baseclass/network.py index 7975c1bf..16b995a6 100644 --- a/src/bitmessagekivy/baseclass/network.py +++ b/src/bitmessagekivy/baseclass/network.py @@ -9,9 +9,9 @@ from kivy.clock import Clock from kivy.properties import StringProperty from kivy.uix.screenmanager import Screen -from network import objectracker, stats +from pybitmessage.network import objectracker, stats -import state +from pybitmessage import state class NetworkStat(Screen): diff --git a/src/bitmessagekivy/baseclass/popup.py b/src/bitmessagekivy/baseclass/popup.py index 055385f1..c6a33056 100644 --- a/src/bitmessagekivy/baseclass/popup.py +++ b/src/bitmessagekivy/baseclass/popup.py @@ -5,7 +5,7 @@ All the popup are managed here. """ - +import logging from datetime import datetime from kivy.clock import Clock @@ -20,8 +20,9 @@ from pybitmessage.bitmessagekivy.get_platform import platform from pybitmessage.bitmessagekivy.baseclass.common import toast -from addresses import decodeAddress -from debug import logger +from pybitmessage.addresses import decodeAddress + +logger = logging.getLogger('default') class AddressChangingLoader(Popup): diff --git a/src/bitmessagekivy/baseclass/qrcode.py b/src/bitmessagekivy/baseclass/qrcode.py index b3ad56b2..4c6d99a0 100644 --- a/src/bitmessagekivy/baseclass/qrcode.py +++ b/src/bitmessagekivy/baseclass/qrcode.py @@ -4,11 +4,14 @@ Generate QRcode of saved addresses in addressbook. """ +import logging + from kivy.app import App from kivy.uix.screenmanager import Screen from kivy.properties import StringProperty from kivy_garden.qrcode import QRCodeWidget -from debug import logger + +logger = logging.getLogger('default') class ShowQRCode(Screen): diff --git a/src/bitmessagekivy/baseclass/scan_screen.py b/src/bitmessagekivy/baseclass/scan_screen.py index a06eca51..3321a4fa 100644 --- a/src/bitmessagekivy/baseclass/scan_screen.py +++ b/src/bitmessagekivy/baseclass/scan_screen.py @@ -7,6 +7,7 @@ QR code Scan Screen used in message composer to get recipient address """ import os +import logging import cv2 from kivy.clock import Clock @@ -20,13 +21,13 @@ from kivy.uix.screenmanager import Screen from pybitmessage.bitmessagekivy.get_platform import platform -from debug import logger +logger = logging.getLogger('default') class ScanScreen(Screen): """ScanScreen is for scaning Qr code""" # pylint: disable=W0212 - camera_avaialbe = BooleanProperty(False) + camera_available = BooleanProperty(False) previous_open_screen = StringProperty() pop_up_instance = ObjectProperty() @@ -42,13 +43,13 @@ class ScanScreen(Screen): is_cam_open = cap.isOpened() while is_cam_open: logger.debug('Camera is available!') - self.camera_avaialbe = True + self.camera_available = True break else: logger.debug("Camera is not available!") - self.camera_avaialbe = False + self.camera_available = False else: - self.camera_avaialbe = True + self.camera_available = True def get_screen(self, screen_name, instance=None): """This method is used for getting previous screen name""" diff --git a/src/bitmessagekivy/uikivysignaler.py b/src/bitmessagekivy/uikivysignaler.py index b4ef3503..6f73247e 100644 --- a/src/bitmessagekivy/uikivysignaler.py +++ b/src/bitmessagekivy/uikivysignaler.py @@ -2,14 +2,18 @@ UI Singnaler for kivy interface """ +import logging + from threading import Thread from kivy.app import App -import queues -import state -from debug import logger +from pybitmessage import queues +from pybitmessage import state + from pybitmessage.bitmessagekivy.baseclass.common import kivy_state_variables +logger = logging.getLogger('default') + class UIkivySignaler(Thread): """Kivy ui signaler"""