ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

PEP-8 + ping.py changes

Browse source
This commit is contained in:
Luke Rogers 2012-03-23 18:14:58 +13:00
parent 3224bbe370
commit f025df92b6
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/ping.py
View file

@ -3,7 +3,7 @@ from util import hook
import subprocess import subprocess
import re import re
PING_REGEX = "rtt min/avg/max/mdev = (\d+.\d+)/(\d+.\d+)/(\d+.\d+)/(\d+.\d+)" ping_regex = re.compile(r"(\d+.\d+)/(\d+.\d+)/(\d+.\d+)/(\d+.\d+)")
@hook.command @hook.command
@ -27,9 +27,9 @@ def ping(inp, reply=None):
reply("Attempting to ping %s %s times..." % (host, count)) reply("Attempting to ping %s %s times..." % (host, count))
pingcmd = subprocess.check_output(["ping", "-c", count, host]) pingcmd = subprocess.check_output(["ping", "-c", count, host])
if 'request timed out' in pingcmd or 'unknown host' in pingcmd: if "request timed out" in pingcmd or "unknown host" in pingcmd:
return "error: could not ping host" return "error: could not ping host"
else: else:
m = re.search(PING_REGEX, pingcmd) m = re.search(ping_regex, pingcmd)
return "min: %sms, max: %sms, average: %sms, range: %sms, count: %s" \ return "min: %sms, max: %sms, average: %sms, range: %sms, count: %s" \
% (m.group(1), m.group(3), m.group(2), m.group(4), count) % (m.group(1), m.group(3), m.group(2), m.group(4), count)

9
plugins/urlparse.py
View file

@ -1,7 +1,8 @@
from util import hook, http, urlnorm from util import hook, http, urlnorm
import re import re
titler = re.compile(r'(?si)<title>(.+?)</title>'); titler = re.compile(r'(?si)<title>(.+?)</title>')
def parse(url): def parse(url):
""" an improved version of our parsing code - now regex powered """ """ an improved version of our parsing code - now regex powered """
@ -20,17 +21,17 @@ def parse(url):
title = match.group(1) title = match.group(1)
except: except:
return "Could not parse URL! Are you sure its valid?" return "Could not parse URL! Are you sure its valid?"
title = http.unescape(title) title = http.unescape(title)
# if the url has been redirected, show us # if the url has been redirected, show us
if real_url == url: if real_url == url:
return title return title
else: else:
return u"%s [%s]" % (title, real_url) return u"%s [%s]" % (title, real_url)
@hook.command @hook.command
def title(inp): def title(inp):
".title <url> -- gets the title of a web page" ".title <url> -- gets the title of a web page"
return parse(inp) return parse(inp)