From d78f96b3eccf75be5fec759c90d9882fdbb59aba Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Fri, 29 Nov 2013 11:55:07 +1300 Subject: [PATCH] . --- plugins/coins.py | 2 +- plugins/minecraft_ping.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/coins.py b/plugins/coins.py index 956c0f2..277b822 100644 --- a/plugins/coins.py +++ b/plugins/coins.py @@ -8,7 +8,7 @@ def bitcoin(inp): exchanges = { "mtgox": { "api_url": "https://mtgox.com/api/1/BTCUSD/ticker", - "func": lambda data: u"MtGox // Current: \x0307{}\x0f High: \x0307{}\x0f Low: \x0307{}\x0f Best Ask: \x0307{}\x0f Volume: {}".format(data['return']['last']['display'], \ + "func": lambda data: u"MtGox // Current: \x0307{}\x0f - High: \x0307{}\x0f - Low: \x0307{}\x0f - Best Ask: \x0307{}\x0f - Volume: {}".format(data['return']['last']['display'], \ data['return']['high']['display'], data['return']['low']['display'], data['return']['buy']['display'], \ data['return']['vol']['display']) }, diff --git a/plugins/minecraft_ping.py b/plugins/minecraft_ping.py index 3cc2add..8752639 100644 --- a/plugins/minecraft_ping.py +++ b/plugins/minecraft_ping.py @@ -166,11 +166,11 @@ def mcping(inp): try: host, port = parse_input(inp) except Exception as e: - return ex.args[0] + return e.args[0] try: return mcping_modern(host, port) except socket.error: try: return mcping_legacy(host, port) except: - return "The server {}:{} looks offline from here.".format(host, port) + return "The server {} ({}:{}) looks offline from here.".format(inp, host, port)