tMerge pull request #2864 from SomberNight/py3_print - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 60c1c6ccebcc7c62e72ff0b14b773ed6a77b0c8d
DIR parent 6fda3733e4ca86625b3534efe93e581b3f85bf22
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 12 Sep 2017 18:05:01 +0200
Merge pull request #2864 from SomberNight/py3_print
migrating print() to python 3
Diffstat:
M gui/kivy/nfc_scanner/scanner_andro… | 6 +++---
M gui/kivy/uix/dialogs/qr_scanner.py | 2 +-
M scripts/estimate_fee | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/gui/kivy/nfc_scanner/scanner_android.py b/gui/kivy/nfc_scanner/scanner_android.py
t@@ -123,7 +123,7 @@ class ScannerAndroid(NFCBase):
details['recTypes'] = recTypes
except Exception as err:
- print str(err)
+ print(str(err))
return details
t@@ -141,7 +141,7 @@ class ScannerAndroid(NFCBase):
#details = self.get_ndef_details(tag)
if intent.getAction() not in action_list:
- print 'unknow action, avoid.'
+ print('unknow action, avoid.')
return
rawmsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES)
t@@ -150,7 +150,7 @@ class ScannerAndroid(NFCBase):
for message in rawmsgs:
message = cast(NdefMessage, message)
payload = message.getRecords()[0].getPayload()
- print 'payload: {}'.format(''.join(map(chr, payload)))
+ print('payload: {}'.format(''.join(map(chr, payload))))
def nfc_disable(self):
'''Disable app from handling tags.
DIR diff --git a/gui/kivy/uix/dialogs/qr_scanner.py b/gui/kivy/uix/dialogs/qr_scanner.py
t@@ -17,7 +17,7 @@ class QrScannerDialog(Factory.AnimatedPopup):
def on_complete(self, x):
''' Default Handler for on_complete event.
'''
- print x
+ print(x)
Builder.load_string('''
DIR diff --git a/scripts/estimate_fee b/scripts/estimate_fee
t@@ -2,4 +2,4 @@
import util, json
peers = util.get_peers()
results = util.send_request(peers, 'blockchain.estimatefee', [2])
-print json.dumps(results, indent=4)
+print(json.dumps(results, indent=4))