diff --git a/pandora/user/urls.py b/pandora/user/urls.py deleted file mode 100644 index 429e1da9..00000000 --- a/pandora/user/urls.py +++ /dev/null @@ -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'), -) - diff --git a/pandora/user/utils.py b/pandora/user/utils.py index 5328a464..db557dfe 100644 --- a/pandora/user/utils.py +++ b/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: