From b515feb456c70549d46c2be86d217ef8f8c93fa7 Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 27 Mar 2012 16:17:50 +0000 Subject: [PATCH] remove mail->country check, too esoteric --- pandora/user/models.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pandora/user/models.py b/pandora/user/models.py index b8ee1064..1044c5c1 100644 --- a/pandora/user/models.py +++ b/pandora/user/models.py @@ -69,19 +69,12 @@ class SessionData(models.Model): self.location = u'%s, %s' % (city, country) self.location_sort = u'%s, %s' % (country, city) else: - self.location_sort = self.location = country + self.location_sort = self.location = country else: self.location_sort = self.location = None except: self.location_sort = self.location = None pass - if self.location == None and self.user and self.user.email: - tld = self.user.email.split('.')[-1] - if tld in ['edu', 'gov', 'mil']: - tld = 'us' - country = ox.get_country_name(tld) - if country: - self.location_sort = self.location = country def save(self, *args, **kwargs): if self.user: