tCorrected import paths for print_error. - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 188a6716817edfdef2248091ce440028d4f15972
DIR parent 02ba760c39b04a658897a3a3d01d07e0c861dddc
HTML Author: Amir Taaki <genjix@riseup.net>
Date: Sat, 7 Jul 2012 19:53:54 +0100
Corrected import paths for print_error.
Diffstat:
M electrum | 5 ++++-
M lib/gui.py | 2 +-
M lib/gui_qt.py | 2 +-
M lib/interface.py | 2 +-
M remote_wallet.py | 5 ++++-
M upgrade.py | 7 ++-----
6 files changed, 13 insertions(+), 10 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -17,7 +17,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re, sys
-from lib.util import print_error
+try:
+ from lib.util import print_error
+except ImportError:
+ from electrum.util import print_error
try:
import ecdsa
DIR diff --git a/lib/gui.py b/lib/gui.py
t@@ -23,7 +23,7 @@ import pygtk
pygtk.require('2.0')
import gtk, gobject
from decimal import Decimal
-from lib.util import print_error
+from util import print_error
import pyqrnative, mnemonic
DIR diff --git a/lib/gui_qt.py b/lib/gui_qt.py
t@@ -18,7 +18,7 @@
import sys, time, datetime, re
from i18n import _
-from lib.util import print_error
+from util import print_error
try:
import PyQt4
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -21,7 +21,7 @@ import random, socket, ast, re
import threading, traceback, sys, time, json, Queue
from version import ELECTRUM_VERSION
-from lib.util import print_error
+from util import print_error
DEFAULT_TIMEOUT = 5
DEFAULT_SERVERS = [ 'ecdsa.org:50001:t',
DIR diff --git a/remote_wallet.py b/remote_wallet.py
t@@ -21,7 +21,10 @@ import time, thread, sys, socket
# see http://code.google.com/p/jsonrpclib/
import jsonrpclib
from wallet import Wallet
-from lib.util import print_error
+try:
+ from lib.util import print_error
+except ImportError:
+ from electrum.util import print_error
"""
Simple wallet daemon for webservers.
DIR diff --git a/upgrade.py b/upgrade.py
t@@ -3,13 +3,10 @@ from version import SEED_VERSION
try:
from lib import prompt_password
+ from lib.util import print_error
except ImportError:
from electrum import prompt_password
-
-from lib.uril import print_error
-
-
-
+ from electrum.util import print_error
if __name__ == "__main__":
try: