Merge pull request #40 from artofhuman/dev

Fixed urls in django_geoip urls.py for new import location

django_geoip/urls.py

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import *
+except ImportError:
+    from django.conf.urls.defaults import *
+
 from django_geoip.views import set_location
 
 urlpatterns = patterns('',
     url(r'^setlocation/', set_location, name='geoip_change_location'),
-)
+)

test_app/urls.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 try:
-    from django.conf.urls import patterns
+    from django.conf.urls import patterns, include
 except ImportError:
-    from django.conf.urls.defaults import patterns
+    from django.conf.urls.defaults import patterns, include
 from django.http import HttpResponse
 from django_geoip.views import set_location
 
@@ -13,6 +13,6 @@ def index_view(request):
 
 urlpatterns = patterns('',
     ('^$', index_view),
-    ('^set_location/$', set_location),
+    (r'^geoip/', include('django_geoip.urls')),
     ('^hello/$', index_view),
-)
+)

tests/test_views.py

@@ -9,7 +9,7 @@
 class SetLocationTest(TestCase):
 
     def setUp(self):
-        self.url = '/set_location/'
+        self.url = '/geoip/setlocation/'
         self.location = create_custom_location(MyCustomLocation)
 
         self.location_model_patcher = patch.object(settings, 'GEOIP_LOCATION_MODEL', 'test_app.models.MyCustomLocation')
@@ -43,4 +43,4 @@ def test_alternative_post_name(self):
     def test_post_fake_location(self):
         response = self.client.post(self.url, data={'location_id': self.location.id+1})
         self.assertFalse(settings.GEOIP_COOKIE_NAME in response.cookies)
-        self.assertRedirects(response, 'http://testserver/')
+        self.assertRedirects(response, 'http://testserver/')