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

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	plugins/factoids.py
	plugins/geoip.py
This commit is contained in:
Luke Rogers 2014-02-14 17:05:52 +13:00
commit 014c4bdc4b
26 changed files with 72 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/geoip.py
View file

@ -13,7 +13,7 @@ with open("./data/geoip_regions.json", "rb") as f:
regions = json.loads(f.read())
if os.path.isfile(os.path.abspath("./data/GeoLiteCity.dat")):
# initalise geolocation database
# initialise geolocation database
geo = pygeoip.GeoIP(os.path.abspath("./data/GeoLiteCity.dat"))
else:
download = http.get("http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz")