electrum

commit 307ec36d34c64f5454fb0d48b1cf29989fb09134
parent 81b9f8281d3e6276a6bae2eb96496d02c1fed6b5
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 29 Jan 2016 09:29:19 +0100

Merge branch 'master' of git://github.com/spesmilo/electrum

Diffstat:
M
electrum
 | 
2
+-
M
gui/kivy/nfc_scanner/scanner_android.py
 | 
1
-

2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/electrum b/electrum
@@ -54,7 +54,7 @@ def check_imports():
     try:
         from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1
     except Exception:
-	sys.exit("cannot import ecdsa.curve_secp256k1. You probably need to upgrade ecdsa.\nTry: sudo pip install --upgrade ecdsa")
+        sys.exit("cannot import ecdsa.curve_secp256k1. You probably need to upgrade ecdsa.\nTry: sudo pip install --upgrade ecdsa")
     # make sure that certificates are here
     assert os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH)
 
diff --git a/gui/kivy/nfc_scanner/scanner_android.py b/gui/kivy/nfc_scanner/scanner_android.py
@@ -115,7 +115,6 @@ class ScannerAndroid(NFCBase):
             #print 'length', length
             # will contain the NDEF record types
             recTypes = []
-            self.
             for record in ndefrecords:
                 recTypes.append({
                     'type': ''.join(map(unichr, record.getType())),