diff options
Diffstat (limited to 'PythonTBC')
| -rw-r--r-- | PythonTBC/settings.py | 8 | ||||
| -rw-r--r-- | PythonTBC/urls.py | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/PythonTBC/settings.py b/PythonTBC/settings.py index 28eda1d..46131a9 100644 --- a/PythonTBC/settings.py +++ b/PythonTBC/settings.py @@ -1,7 +1,7 @@ # Django settings for PythonTBC project. from os.path import * -from local import * +from .local import * DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -97,7 +97,7 @@ SECRET_KEY = 'a8zm$)bj&k9p2$1*biby#mo5fga#8$sr4&cmz%h=vum-xkbkme' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', + #'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -138,15 +138,13 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'tbc', 'comments', - 'south', + #'south', 'commentingapp', 'tbc_error_page', 'taggit', 'taggit_templatetags2', ) - - SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer' # A sample logging configuration. The only tangible logging diff --git a/PythonTBC/urls.py b/PythonTBC/urls.py index 34bc0f6..77d166a 100644 --- a/PythonTBC/urls.py +++ b/PythonTBC/urls.py @@ -1,15 +1,17 @@ from django.conf.urls import patterns, include, url - +import tbc_error_page.views +import commentingapp.views +import django.contrib.sitemaps.views # Uncomment the next two lines to enable the admin: from django.contrib import admin admin.autodiscover() -from sitemap import TbcBookSitemap +from .sitemap import TbcBookSitemap sitemaps = { 'book': TbcBookSitemap, } -urlpatterns = patterns('', +urlpatterns = [ # Examples: # url(r'^$', 'PythonTBC.views.home', name='home'), # url(r'^PythonTBC/', include('PythonTBC.foo.urls')), @@ -20,12 +22,12 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: url(r'^admin', include(admin.site.urls)), url(r'^', include('tbc.urls', namespace='tbc')), - url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}), + url(r'^sitemap\.xml$', django.contrib.sitemaps.views.sitemap, {'sitemaps': sitemaps}), - url(r'^admin-tools/commenting', 'commentingapp.views.commenting', name = 'commenting'), - url(r'^admin-tools/error_page', 'tbc_error_page.views.error', name = 'error_page'), - url(r'^admin-tools/broken_page', 'tbc_error_page.views.broken', name = 'broken_page'), + url(r'^admin-tools/commenting', commentingapp.views.commenting, name = 'commenting'), + url(r'^admin-tools/error_page', tbc_error_page.views.error, name = 'error_page'), + url(r'^admin-tools/broken_page', tbc_error_page.views.broken, name = 'broken_page'), -) +] |