fix country fallback

pandora/user/urls.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.conf.urls.defaults import *
-
-
-urlpatterns = patterns("user.views",
-    (r'^preferences', 'preferences'),
-    (r'^login', 'login'),
-    (r'^logout', 'logout'),
-    (r'^register', 'register'),
-)
-

pandora/user/utils.py

@@ -24,7 +24,7 @@ def get_location(ip):
             location = g.city(ip)
         except:
             try:
-                location = g.country(s.ip)
+                location = g.country(ip)
             except:
                 location = None
         if location: