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

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	plugins/spotify.py
This commit is contained in:
Luke Rogers 2014-03-31 20:27:04 +13:00
commit 4f2a3b099b
4 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/geoip.py
View file

@ -51,4 +51,4 @@ def geoip(inp):
data["cc"] = record["country_code"] or "N/A"
data["country"] = record["country_name"] or "Unknown"
data["city"] = record["city"] or "Unknown"
return "\x02Country:\x02 {country} ({cc}), \x02City:\x02 {city}{region}".format(**data)
return u"\x02Country:\x02 {country} ({cc}), \x02City:\x02 {city}{region}".format(**data)