decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

ips without city

Browse source
This commit is contained in:
j 2012-03-21 20:56:57 +01:00
parent 105e91d6dd
commit 9b02269361
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora/user/models.py
View file

@ -61,10 +61,13 @@ class SessionData(models.Model):
g = GeoIP() g = GeoIP()
location = g.city(self.ip) location = g.city(self.ip)
if location: if location:
city = location['city'].decode('latin-1')
country = ox.get_country_name(location['country_code']) country = ox.get_country_name(location['country_code'])
self.location = u'%s, %s' % (city, country) if location['city']:
self.location_sort = u'%s, %s' % (country, city) city = location['city'].decode('latin-1')
self.location = u'%s, %s' % (city, country)
self.location_sort = u'%s, %s' % (country, city)
else:
self.location_sort = self.location = country
else: else:
self.location_sort = self.location = None self.location_sort = self.location = None
except: except: