mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-21 22:13:19 -07:00
Python scripts 'futurize'd to support python3
This commit is contained in:
parent
3903298ede
commit
d5bc9d5ea0
3 changed files with 18 additions and 12 deletions
|
@ -23,6 +23,7 @@
|
||||||
# If you change any strings, please generate localization information with:
|
# If you change any strings, please generate localization information with:
|
||||||
# ./debian/rules get-po
|
# ./debian/rules get-po
|
||||||
|
|
||||||
|
from __future__ import print_function
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import os.path
|
import os.path
|
||||||
|
@ -185,7 +186,7 @@ def readstatus():
|
||||||
else:
|
else:
|
||||||
status[i] = "1"
|
status[i] = "1"
|
||||||
li = []
|
li = []
|
||||||
keys = status.keys()
|
keys = list(status.keys())
|
||||||
for i in sorted(keys):
|
for i in sorted(keys):
|
||||||
window = [int(status[i]), i]
|
window = [int(status[i]), i]
|
||||||
li.append(window)
|
li.append(window)
|
||||||
|
|
|
@ -21,7 +21,11 @@
|
||||||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#
|
#
|
||||||
import urllib2
|
from __future__ import print_function
|
||||||
|
from future import standard_library
|
||||||
|
standard_library.install_aliases()
|
||||||
|
from builtins import object
|
||||||
|
import urllib.request, urllib.error, urllib.parse
|
||||||
import argparse
|
import argparse
|
||||||
import datetime
|
import datetime
|
||||||
try:
|
try:
|
||||||
|
@ -280,7 +284,7 @@ def _load_data(url, use_cache=False, cache_class=SimpleResultsCache):
|
||||||
if result is not None:
|
if result is not None:
|
||||||
return result
|
return result
|
||||||
|
|
||||||
f = urllib2.urlopen(url)
|
f = urllib.request.urlopen(url)
|
||||||
result = json.loads(f.read())
|
result = json.loads(f.read())
|
||||||
|
|
||||||
if use_cache:
|
if use_cache:
|
||||||
|
@ -498,7 +502,7 @@ if __name__ == "__main__":
|
||||||
try:
|
try:
|
||||||
import argparse
|
import argparse
|
||||||
except ImportError:
|
except ImportError:
|
||||||
print "ERROR: You are running Python < 2.7. Please use pip to install argparse: pip install argparse"
|
print("ERROR: You are running Python < 2.7. Please use pip to install argparse: pip install argparse")
|
||||||
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(add_help=True, description="Print out the current prices of EC2 instances")
|
parser = argparse.ArgumentParser(add_help=True, description="Print out the current prices of EC2 instances")
|
||||||
|
@ -514,7 +518,7 @@ if __name__ == "__main__":
|
||||||
try:
|
try:
|
||||||
from prettytable import PrettyTable
|
from prettytable import PrettyTable
|
||||||
except ImportError:
|
except ImportError:
|
||||||
print "ERROR: Please install 'prettytable' using pip: pip install prettytable"
|
print("ERROR: Please install 'prettytable' using pip: pip install prettytable")
|
||||||
|
|
||||||
data = None
|
data = None
|
||||||
if args.type == "ondemand":
|
if args.type == "ondemand":
|
||||||
|
@ -523,7 +527,7 @@ if __name__ == "__main__":
|
||||||
data = get_ec2_reserved_instances_prices(args.filter_region, args.filter_type, args.filter_os_type)
|
data = get_ec2_reserved_instances_prices(args.filter_region, args.filter_type, args.filter_os_type)
|
||||||
|
|
||||||
if args.format == "json":
|
if args.format == "json":
|
||||||
print json.dumps(data)
|
print(json.dumps(data))
|
||||||
elif args.format == "table":
|
elif args.format == "table":
|
||||||
x = PrettyTable()
|
x = PrettyTable()
|
||||||
|
|
||||||
|
@ -561,18 +565,18 @@ if __name__ == "__main__":
|
||||||
for term in it["prices"]:
|
for term in it["prices"]:
|
||||||
x.add_row([region_name, it["type"], it["os"], it["utilization"], term, none_as_string(it["prices"][term]["hourly"]), none_as_string(it["prices"][term]["upfront"])])
|
x.add_row([region_name, it["type"], it["os"], it["utilization"], term, none_as_string(it["prices"][term]["hourly"]), none_as_string(it["prices"][term]["upfront"])])
|
||||||
|
|
||||||
print x
|
print(x)
|
||||||
elif args.format == "csv":
|
elif args.format == "csv":
|
||||||
if args.type == "ondemand":
|
if args.type == "ondemand":
|
||||||
print "region,type,os,price"
|
print("region,type,os,price")
|
||||||
for r in data["regions"]:
|
for r in data["regions"]:
|
||||||
region_name = r["region"]
|
region_name = r["region"]
|
||||||
for it in r["instanceTypes"]:
|
for it in r["instanceTypes"]:
|
||||||
print "%s,%s,%s,%s" % (region_name, it["type"], it["os"], none_as_string(it["price"]))
|
print("%s,%s,%s,%s" % (region_name, it["type"], it["os"], none_as_string(it["price"])))
|
||||||
elif args.type == "reserved":
|
elif args.type == "reserved":
|
||||||
print "region,type,os,utilization,term,price,upfront"
|
print("region,type,os,utilization,term,price,upfront")
|
||||||
for r in data["regions"]:
|
for r in data["regions"]:
|
||||||
region_name = r["region"]
|
region_name = r["region"]
|
||||||
for it in r["instanceTypes"]:
|
for it in r["instanceTypes"]:
|
||||||
for term in it["prices"]:
|
for term in it["prices"]:
|
||||||
print "%s,%s,%s,%s,%s,%s,%s" % (region_name, it["type"], it["os"], it["utilization"], term, none_as_string(it["prices"][term]["hourly"]), none_as_string(it["prices"][term]["upfront"]))
|
print("%s,%s,%s,%s,%s,%s,%s" % (region_name, it["type"], it["os"], it["utilization"], term, none_as_string(it["prices"][term]["hourly"]), none_as_string(it["prices"][term]["upfront"])))
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
from builtins import input
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
@ -118,7 +119,7 @@ if len(sessions) > 1:
|
||||||
sys.stdout.write(" %d. %s\n" % (i, s))
|
sys.stdout.write(" %d. %s\n" % (i, s))
|
||||||
i += 1
|
i += 1
|
||||||
try:
|
try:
|
||||||
choice = int(input("\nChoose 1-%d [1]: " % (i - 1)))
|
choice = int(eval(input("\nChoose 1-%d [1]: " % (i - 1))))
|
||||||
if choice >= 1 and choice < i:
|
if choice >= 1 and choice < i:
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue