From 0d23d176ce39fe7536122d80844eef990d7c002b Mon Sep 17 00:00:00 2001 From: Arinerron Date: Sun, 22 Apr 2018 21:42:34 -0700 Subject: [PATCH 1/2] Move tkinter requirement to openGUI function --- onionr/default-plugins/gui/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/onionr/default-plugins/gui/main.py b/onionr/default-plugins/gui/main.py index 6cf78289..c7dc0453 100644 --- a/onionr/default-plugins/gui/main.py +++ b/onionr/default-plugins/gui/main.py @@ -17,7 +17,6 @@ # Imports some useful libraries import logger, config -from tkinter import * import os, sqlite3, core def sendMessage(): @@ -56,6 +55,8 @@ def update(): def openGUI(): + from tkinter import * + global root, runningCheckDelay, runningCheckDelayCount, scrollbar, listedBlocks, nodeInfo, keyInfo, idText, idEntry, pubKeyEntry, listbox, daemonStatus, sendEntry root = Tk() From 3f6f981847503e99e89a6cf166262213def88f05 Mon Sep 17 00:00:00 2001 From: Arinerron Date: Sun, 22 Apr 2018 21:47:14 -0700 Subject: [PATCH 2/2] Change bootstrap node list --- onionr/onionr.py | 2 +- onionr/static-data/bootstrap-nodes.txt | 2 +- onionr/{ => static-data}/default_plugin.txt | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename onionr/{ => static-data}/default_plugin.txt (100%) diff --git a/onionr/onionr.py b/onionr/onionr.py index 3e895638..54937e0f 100755 --- a/onionr/onionr.py +++ b/onionr/onionr.py @@ -445,7 +445,7 @@ class Onionr: os.makedirs(plugins.get_plugins_folder(plugin_name)) with open(plugins.get_plugins_folder(plugin_name) + '/main.py', 'a') as main: - main.write(open('default_plugin.txt').read().replace('$user', os.getlogin()).replace('$date', datetime.datetime.now().strftime('%Y-%m-%d'))) + main.write(open('static-data/default_plugin.txt').read().replace('$user', os.getlogin()).replace('$date', datetime.datetime.now().strftime('%Y-%m-%d'))) logger.info('Enabling plugin \"' + plugin_name + '\"...') plugins.enable(plugin_name, self) diff --git a/onionr/static-data/bootstrap-nodes.txt b/onionr/static-data/bootstrap-nodes.txt index 64215eb7..ba5c76f0 100644 --- a/onionr/static-data/bootstrap-nodes.txt +++ b/onionr/static-data/bootstrap-nodes.txt @@ -1,3 +1,3 @@ onionisrgccylxpr.onion -aaronk3mcmglj6qedwptg62yl3wxxjwba2ucpoobrn7iudcacdxtrfad.onion +dgyllprmtmym4gbk.onion onionragxuddecmg.onion diff --git a/onionr/default_plugin.txt b/onionr/static-data/default_plugin.txt similarity index 100% rename from onionr/default_plugin.txt rename to onionr/static-data/default_plugin.txt