git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1120b7b
)
fix imports
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 29 Mar 2013 16:06:46 +0000
(12:06 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 29 Mar 2013 16:06:46 +0000
(12:06 -0400)
plstackapi/core/admin.py
patch
|
blob
|
history
plstackapi/core/serializers.py
patch
|
blob
|
history
plstackapi/core/views.py
patch
|
blob
|
history
plstackapi/planetstack/settings.py
patch
|
blob
|
history
plstackapi/planetstack/urls.py
patch
|
blob
|
history
plstackapi/planetstack/wsgi.py
patch
|
blob
|
history
diff --git
a/plstackapi/core/admin.py
b/plstackapi/core/admin.py
index
fd51666
..
18c1e86
100644
(file)
--- a/
plstackapi/core/admin.py
+++ b/
plstackapi/core/admin.py
@@
-1,4
+1,4
@@
-from core.models import *
+from
plstackapi.
core.models import *
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
diff --git
a/plstackapi/core/serializers.py
b/plstackapi/core/serializers.py
index
62ac271
..
2973ab4
100644
(file)
--- a/
plstackapi/core/serializers.py
+++ b/
plstackapi/core/serializers.py
@@
-1,6
+1,6
@@
from django.forms import widgets
from rest_framework import serializers
from django.forms import widgets
from rest_framework import serializers
-from models import *
+from
plstackapi.core.
models import *
class SliceSerializer(serializers.HyperlinkedModelSerializer):
class SliceSerializer(serializers.HyperlinkedModelSerializer):
diff --git
a/plstackapi/core/views.py
b/plstackapi/core/views.py
index
ebbd907
..
a5efd36
100644
(file)
--- a/
plstackapi/core/views.py
+++ b/
plstackapi/core/views.py
@@
-1,6
+1,6
@@
# Create your views here.
# Create your views here.
-from models import Site
+from
plstackapi.core.
models import Site
from serializers import *
from rest_framework import generics
from rest_framework.decorators import api_view
from serializers import *
from rest_framework import generics
from rest_framework.decorators import api_view
diff --git
a/plstackapi/planetstack/settings.py
b/plstackapi/planetstack/settings.py
index
86cb924
..
a477452
100644
(file)
--- a/
plstackapi/planetstack/settings.py
+++ b/
plstackapi/planetstack/settings.py
@@
-102,10
+102,10
@@
MIDDLEWARE_CLASSES = (
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
-ROOT_URLCONF = 'planetstack.urls'
+ROOT_URLCONF = 'pl
stackapi.pl
anetstack.urls'
# Python dotted path to the WSGI application used by Django's runserver.
# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'planetstack.wsgi.application'
+WSGI_APPLICATION = 'pl
stackapi.pl
anetstack.wsgi.application'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
diff --git
a/plstackapi/planetstack/urls.py
b/plstackapi/planetstack/urls.py
index
a4cf203
..
f04a87f
100644
(file)
--- a/
plstackapi/planetstack/urls.py
+++ b/
plstackapi/planetstack/urls.py
@@
-2,9
+2,9
@@
from django.conf.urls import patterns, include, url
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
-from core import views
-from core.views import api_root
-from core.models import Site
+from
plstackapi.
core import views
+from
plstackapi.
core.views import api_root
+from
plstackapi.
core.models import Site
from rest_framework import generics
admin.autodiscover()
from rest_framework import generics
admin.autodiscover()
diff --git
a/plstackapi/planetstack/wsgi.py
b/plstackapi/planetstack/wsgi.py
index
6e03e11
..
11c4ce5
100644
(file)
--- a/
plstackapi/planetstack/wsgi.py
+++ b/
plstackapi/planetstack/wsgi.py
@@
-19,7
+19,7
@@
import os
# if running multiple sites in the same mod_wsgi process. To fix this, use
# mod_wsgi daemon mode with each site in its own daemon process, or use
# os.environ["DJANGO_SETTINGS_MODULE"] = "planetstack.settings"
# if running multiple sites in the same mod_wsgi process. To fix this, use
# mod_wsgi daemon mode with each site in its own daemon process, or use
# os.environ["DJANGO_SETTINGS_MODULE"] = "planetstack.settings"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pl
stackapi.pl
anetstack.settings")
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION