django 1.6HEADmaster

1 files changed, 8 insertions, 7 deletions

diff --git a/urls.py b/urls.py
index 4df0fd3..5a6dc75 100644
--- a/urls.py
+++ b/urls.py
@@ -3,13 +3,13 @@ from django.conf import settings
 from django.conf.urls.defaults import *
 from django.views.generic.simple import redirect_to
 from django.contrib import admin
-from tastypie.api import Api
-from elgarito.api import EncuestaResource, RespuestaResource, MensajeResource
+#from tastypie.api import Api
+#from api import EncuestaResource, RespuestaResource, MensajeResource
 
-v1_api = Api(api_name='v1')
-v1_api.register(EncuestaResource())
-v1_api.register(RespuestaResource())
-v1_api.register(MensajeResource())
+#v1_api = Api(api_name='v1')
+#v1_api.register(EncuestaResource())
+#v1_api.register(RespuestaResource())
+#v1_api.register(MensajeResource())
 
 admin.autodiscover()
 
@@ -50,5 +50,6 @@ urlpatterns = patterns(
     (r'^servicios/', include('elgarito.servicios.urls')),
     
     # API
-    (r'^api/', include(v1_api.urls)),
+    #(r'^api/', include(v1_api.urls)),
+    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 )