From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 10 Apr 2013 00:25:08 +0000 (-0400)
Subject: fix TypeError
X-Git-Tag: 1.0~143
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7d97f06e4cfdf4249d6384e41208d7bc0ece202a;p=plstackapi.git

fix TypeError
---

diff --git a/plstackapi/core/api/users.py b/plstackapi/core/api/users.py
index 09384f2..18a68c7 100644
--- a/plstackapi/core/api/users.py
+++ b/plstackapi/core/api/users.py
@@ -13,7 +13,7 @@ def lookup_site(fields):
         if sites:
             site = sites[0]
     if not site:
-        raise Exception, "No such site", fields['site']
+        raise Exception, "No such site: %s" % fields['site']
     return site 
 
 def add_user(auth, fields):
diff --git a/plstackapi/core/urls.py b/plstackapi/core/urls.py
index 985fd48..5d9df50 100644
--- a/plstackapi/core/urls.py
+++ b/plstackapi/core/urls.py
@@ -10,7 +10,7 @@ from plstackapi.core.views.deployment_networks import DeploymentNetworkListCreat
 from plstackapi.core.views.images import ImageListCreate, ImageRetrieveUpdateDestroy
 from plstackapi.core.views.flavors import FlavorListCreate, FlavorRetrieveUpdateDestroy
 from plstackapi.core.models import Site
-from plstackapi.planetstack.api_root import api_root
+from plstackapi.core.api_root import api_root
 from rest_framework import generics
 
 admin.autodiscover()
@@ -26,7 +26,7 @@ urlpatterns = patterns('',
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
 
-    #url(r'^plstackapi/$', api_root),
+    url(r'^plstackapi/$', api_root),
     
     url(r'^plstackapi/roles/$', RoleListCreate.as_view(), name='role-list'),
     url(r'^plstackapi/roles/(?P<pk>[a-zA-Z0-9]+)/$', RoleRetrieveUpdateDestroy.as_view(), name='role-detail'),
diff --git a/plstackapi/planetstack/settings.py b/plstackapi/planetstack/settings.py
index 16e3b97..f638c26 100644
--- a/plstackapi/planetstack/settings.py
+++ b/plstackapi/planetstack/settings.py
@@ -104,7 +104,7 @@ MIDDLEWARE_CLASSES = (
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'plstackapi.planetstack.urls'
+ROOT_URLCONF = 'plstackapi.core.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'plstackapi.planetstack.wsgi.application'