varia/etherpump
14
0
Fork 0
Code Issues 15 Pull Requests Releases Activity

updated settext to py3

Browse Source
This commit is contained in:
Michael Murtaugh 2018-09-07 10:34:53 +02:00
parent 59de1fa7ca
commit 4a8219b48c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etherdump/commands/settext.py
View File

@ -1,8 +1,16 @@
from __future__ import print_function from __future__ import print_function
from argparse import ArgumentParser from argparse import ArgumentParser
import json, sys import json, sys
from urllib import urlencode
from urllib2 import urlopen, HTTPError, URLError try:
# python2
from urllib2 import urlopen, URLError, HTTPError
from urllib import urlencode
except ImportError:
# python3
from urllib.parse import urlencode, quote
from urllib.request import urlopen, URLError, HTTPError
import requests import requests
@ -56,5 +64,5 @@ def main(args):
results = requests.post(requesturl, params=data) # json.load(urlopen(requesturl)) results = requests.post(requesturl, params=data) # json.load(urlopen(requesturl))
results = json.loads(results.text) results = json.loads(results.text)
if results['code'] != 0: if results['code'] != 0:
print (u"setText: ERROR ({0}) on pad {1}: {2}".format(results['code'], args.padid, results['message']).encode("utf-8")) print ("setText: ERROR ({0}) on pad {1}: {2}".format(results['code'], args.padid, results['message']))
# json.dumps(results, indent=2) # json.dumps(results, indent=2)