oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[setuptools packaging] access modules via imports (#1969)

Browse source
This commit is contained in:
radfish 2019-04-15 06:31:33 -04:00 • committed by ZeroNet
parent 6d8f55cf75
commit f6e3a74567
23 changed files with 96 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/disabled-Multiuser/MultiuserPlugin.py
View file

@ -5,6 +5,7 @@ import json
from Config import config
from Plugin import PluginManager
from Crypt import CryptBitcoin
from User import UserManager
from . import UserPlugin
try:
@ -16,7 +17,7 @@ except Exception as err:
@PluginManager.registerTo("UiRequest")
class UiRequestPlugin(object):
def __init__(self, *args, **kwargs):
self.user_manager = sys.modules["User.UserManager"].user_manager
self.user_manager = UserManager.user_manager
super(UiRequestPlugin, self).__init__(*args, **kwargs)
# Create new user and inject user welcome message if necessary
@ -135,7 +136,7 @@ class UiWebsocketPlugin(object):
script += "$('#button_notification').on('click', function() { zeroframe.cmd(\"userLoginForm\", []); });"
self.cmd("injectScript", script)
# Delete from user_manager
user_manager = sys.modules["User.UserManager"].user_manager
user_manager = UserManager.user_manager
if self.user.master_address in user_manager.users:
if not config.multiuser_local:
del user_manager.users[self.user.master_address]
@ -149,7 +150,7 @@ class UiWebsocketPlugin(object):
# Login form submit
def responseUserLogin(self, master_seed):
user_manager = sys.modules["User.UserManager"].user_manager
user_manager = UserManager.user_manager
user = user_manager.get(CryptBitcoin.privatekeyToAddress(master_seed))
if not user:
user = user_manager.create(master_seed=master_seed)