From ec77ea9fa6cadcf96f815d7e8031d0eae251034e Mon Sep 17 00:00:00 2001 From: shekhar-cis Date: Thu, 23 Dec 2021 21:49:58 +0530 Subject: [PATCH] fixing state import --- src/tests/mock/pybitmessage/baseclass/addressbook.py | 4 ++-- src/tests/mock/pybitmessage/baseclass/allmail.py | 10 +++++----- src/tests/mock/pybitmessage/baseclass/draft.py | 12 ++++++------ src/tests/mock/pybitmessage/baseclass/inbox.py | 10 +++++----- src/tests/mock/pybitmessage/baseclass/network.py | 4 ++-- src/tests/mock/pybitmessage/baseclass/payment.py | 2 +- src/tests/mock/pybitmessage/baseclass/popup.py | 2 +- src/tests/mock/pybitmessage/baseclass/sent.py | 10 +++++----- src/tests/mock/pybitmessage/baseclass/trash.py | 6 +++--- src/tests/mock/pybitmessage/mpybit.py | 8 ++++---- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/tests/mock/pybitmessage/baseclass/addressbook.py b/src/tests/mock/pybitmessage/baseclass/addressbook.py index db97b841..20e1ed9e 100644 --- a/src/tests/mock/pybitmessage/baseclass/addressbook.py +++ b/src/tests/mock/pybitmessage/baseclass/addressbook.py @@ -1,7 +1,7 @@ from turtle import pd from pybitmessage.get_platform import platform from pybitmessage import kivy_helper_search -from helper_sql import sqlExecute +from pybitmessage.helper_sql import sqlExecute from functools import partial from kivy.clock import Clock from kivy.properties import ( @@ -13,7 +13,7 @@ from kivymd.uix.dialog import MDDialog from kivymd.uix.label import MDLabel from kivy.uix.screenmanager import Screen -import state +from pybitmessage import state from pybitmessage.baseclass.common import ( avatarImageFirstLetter, toast, diff --git a/src/tests/mock/pybitmessage/baseclass/allmail.py b/src/tests/mock/pybitmessage/baseclass/allmail.py index be2859d9..9e80f94e 100644 --- a/src/tests/mock/pybitmessage/baseclass/allmail.py +++ b/src/tests/mock/pybitmessage/baseclass/allmail.py @@ -1,5 +1,5 @@ -from bmconfigparser import BMConfigParser -from helper_sql import sqlExecute, sqlQuery +from pybitmessage.bmconfigparser import BMConfigParser +from pybitmessage.helper_sql import sqlExecute, sqlQuery from functools import partial from kivy.clock import Clock from kivy.properties import ( @@ -9,14 +9,14 @@ from kivy.properties import ( from kivy.uix.screenmanager import Screen from kivymd.uix.label import MDLabel -import state +from pybitmessage import state from pybitmessage.baseclass.common import ( showLimitedCnt, toast, ThemeClsColor, avatarImageFirstLetter, CutsomSwipeToDeleteItem, ShowTimeHistoy ) -from pybitmessage.baseclass.maildetail import MailDetail +# from pybitmessage.baseclass.maildetail import MailDetail # from pybitmessage.baseclass.trash import Trash @@ -155,7 +155,7 @@ class Allmails(Screen): else: src_mng_obj = self.parent.parent src_mng_obj.screens[11].clear_widgets() - src_mng_obj.screens[11].add_widget(MailDetail()) + # src_mng_obj.screens[11].add_widget(MailDetail()) src_mng_obj.current = 'mailDetail' else: instance.ids.delete_msg.disabled = False diff --git a/src/tests/mock/pybitmessage/baseclass/draft.py b/src/tests/mock/pybitmessage/baseclass/draft.py index cb45ab07..eee3e2c4 100644 --- a/src/tests/mock/pybitmessage/baseclass/draft.py +++ b/src/tests/mock/pybitmessage/baseclass/draft.py @@ -1,10 +1,10 @@ import time from pybitmessage import kivy_helper_search -from bmconfigparser import BMConfigParser -from helper_sql import sqlExecute +from pybitmessage.bmconfigparser import BMConfigParser +from pybitmessage.helper_sql import sqlExecute from functools import partial -from addresses import decodeAddress +from pybitmessage.addresses import decodeAddress from kivy.clock import Clock from kivy.properties import ( ListProperty, @@ -13,13 +13,13 @@ from kivy.properties import ( from kivy.uix.screenmanager import Screen from kivymd.uix.label import MDLabel -import state +from pybitmessage import state from pybitmessage.baseclass.common import ( showLimitedCnt, toast, ThemeClsColor, SwipeToDeleteItem, ShowTimeHistoy ) -from pybitmessage.baseclass.maildetail import MailDetail +# from pybitmessage.baseclass.maildetail import MailDetail class Draft(Screen): @@ -137,7 +137,7 @@ class Draft(Screen): else: src_mng_obj = self.parent.parent src_mng_obj.screens[11].clear_widgets() - src_mng_obj.screens[11].add_widget(MailDetail()) + # src_mng_obj.screens[11].add_widget(MailDetail()) src_mng_obj.current = 'mailDetail' else: instance.ids.delete_msg.disabled = False diff --git a/src/tests/mock/pybitmessage/baseclass/inbox.py b/src/tests/mock/pybitmessage/baseclass/inbox.py index 0ea78dc6..09563eb7 100644 --- a/src/tests/mock/pybitmessage/baseclass/inbox.py +++ b/src/tests/mock/pybitmessage/baseclass/inbox.py @@ -16,13 +16,13 @@ from kivymd.uix.label import MDLabel from pybitmessage import state -from common import ( +from pybitmessage.baseclass.common import ( showLimitedCnt, avatarImageFirstLetter, ThemeClsColor, toast, SwipeToDeleteItem, ShowTimeHistoy ) -from maildetail import MailDetail -from trash import Trash +# from maildetail import MailDetail +# from trash import Trash class Inbox(Screen): @@ -182,7 +182,7 @@ class Inbox(Screen): else: src_mng_obj = self.parent.parent src_mng_obj.screens[11].clear_widgets() - src_mng_obj.screens[11].add_widget(MailDetail()) + # src_mng_obj.screens[11].add_widget(MailDetail()) src_mng_obj.current = "mailDetail" else: instance.ids.delete_msg.disabled = False @@ -223,7 +223,7 @@ class Inbox(Screen): def update_trash(self): """Update trash screen mails which is deleted from inbox""" self.manager.parent.ids.sc5.clear_widgets() - self.manager.parent.ids.sc5.add_widget(Trash()) + # self.manager.parent.ids.sc5.add_widget(Trash()) # try: # self.parent.screens[4].clear_widgets() # self.parent.screens[4].add_widget(Trash()) diff --git a/src/tests/mock/pybitmessage/baseclass/network.py b/src/tests/mock/pybitmessage/baseclass/network.py index bdc79068..c9604314 100644 --- a/src/tests/mock/pybitmessage/baseclass/network.py +++ b/src/tests/mock/pybitmessage/baseclass/network.py @@ -1,10 +1,10 @@ -import state +from pybitmessage import state 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 class NetworkStat(Screen): diff --git a/src/tests/mock/pybitmessage/baseclass/payment.py b/src/tests/mock/pybitmessage/baseclass/payment.py index e2b10be1..bc3de6e8 100644 --- a/src/tests/mock/pybitmessage/baseclass/payment.py +++ b/src/tests/mock/pybitmessage/baseclass/payment.py @@ -15,7 +15,7 @@ from kivymd.uix.list import ( from pybitmessage.baseclass.common import toast # import queues -import state +from pybitmessage import state class Payment(Screen): diff --git a/src/tests/mock/pybitmessage/baseclass/popup.py b/src/tests/mock/pybitmessage/baseclass/popup.py index 5abddc98..0aab78ca 100644 --- a/src/tests/mock/pybitmessage/baseclass/popup.py +++ b/src/tests/mock/pybitmessage/baseclass/popup.py @@ -13,7 +13,7 @@ from pybitmessage import state from pybitmessage.addresses import decodeAddress from datetime import datetime -from common import toast +from pybitmessage.baseclass.common import toast class LoadingPopup(Popup): diff --git a/src/tests/mock/pybitmessage/baseclass/sent.py b/src/tests/mock/pybitmessage/baseclass/sent.py index 45557a00..506a6a9e 100644 --- a/src/tests/mock/pybitmessage/baseclass/sent.py +++ b/src/tests/mock/pybitmessage/baseclass/sent.py @@ -1,8 +1,8 @@ # from pybitmessage import identiconGeneration from pybitmessage import kivy_helper_search -from bmconfigparser import BMConfigParser +from pybitmessage.bmconfigparser import BMConfigParser from functools import partial -from helper_sql import sqlExecute +from pybitmessage.helper_sql import sqlExecute from kivy.clock import Clock from kivy.factory import Factory from kivy.properties import StringProperty, ListProperty @@ -10,13 +10,13 @@ from kivy.properties import StringProperty, ListProperty from kivy.uix.screenmanager import Screen from kivymd.uix.label import MDLabel -import state +from pybitmessage import state from pybitmessage.baseclass.common import ( showLimitedCnt, ThemeClsColor, avatarImageFirstLetter, toast, SwipeToDeleteItem, ShowTimeHistoy ) -from pybitmessage.baseclass.maildetail import MailDetail +# from pybitmessage.baseclass.maildetail import MailDetail class Sent(Screen): @@ -189,7 +189,7 @@ class Sent(Screen): else: src_mng_obj = self.parent.parent src_mng_obj.screens[11].clear_widgets() - src_mng_obj.screens[11].add_widget(MailDetail()) + # src_mng_obj.screens[11].add_widget(MailDetail()) src_mng_obj.current = 'mailDetail' else: instance.ids.delete_msg.disabled = False diff --git a/src/tests/mock/pybitmessage/baseclass/trash.py b/src/tests/mock/pybitmessage/baseclass/trash.py index 6a6fa657..2c8063c7 100644 --- a/src/tests/mock/pybitmessage/baseclass/trash.py +++ b/src/tests/mock/pybitmessage/baseclass/trash.py @@ -1,6 +1,6 @@ from pybitmessage.get_platform import platform -from bmconfigparser import BMConfigParser -from helper_sql import sqlExecute, sqlQuery +# from pybitmessage.bmconfigparser import BMConfigParser +from pybitmessage.helper_sql import sqlExecute, sqlQuery from functools import partial from kivy.clock import Clock from kivy.properties import ( @@ -12,7 +12,7 @@ from kivymd.uix.dialog import MDDialog from kivymd.uix.label import MDLabel from kivy.uix.screenmanager import Screen -import state +from pybitmessage import state from pybitmessage.baseclass.common import ( toast, showLimitedCnt, ThemeClsColor, diff --git a/src/tests/mock/pybitmessage/mpybit.py b/src/tests/mock/pybitmessage/mpybit.py index acfd3ada..698bde3b 100644 --- a/src/tests/mock/pybitmessage/mpybit.py +++ b/src/tests/mock/pybitmessage/mpybit.py @@ -18,7 +18,7 @@ from pybitmessage.bmconfigparser import BMConfigParser # from debug import logger from functools import partial from pybitmessage.helper_sql import sqlExecute, sqlQuery -from pybitmessage.kivymd.app import MDApp +from kivymd.app import MDApp from kivy.clock import Clock from kivy.core.clipboard import Clipboard from kivy.core.window import Window @@ -47,7 +47,7 @@ from kivy.uix.screenmanager import RiseInTransition, SlideTransition, FallOutTra from pybitmessage import queues from pybitmessage.semaphores import kivyuisignaler -import state +from pybitmessage import state from kivymd.uix.bottomsheet import MDCustomBottomSheet from kivy.lang import Observable @@ -58,8 +58,8 @@ import ast from pybitmessage.baseclass.common import toast -from qr_scanner.zbarcam import ZBarCam -from pyzbar.pyzbar import ZBarSymbol +# from qr_scanner.zbarcam import ZBarCam +# from pyzbar.pyzbar import ZBarSymbol if platform != "android": from kivy.config import Config