Merge pull request #41 from kinitrupti/master

Upgraded to python3

2 files changed, 14 insertions, 43 deletions

diff --git a/PythonTBC/settings.py b/PythonTBC/settings.py
index e73bc25..46131a9 100644
--- a/PythonTBC/settings.py
+++ b/PythonTBC/settings.py
@@ -1,10 +1,10 @@
 # Django settings for PythonTBC project.
 
 from os.path import *
-from local import *
+from .local import *
 
 DEBUG = True
-#TEMPLATE_DEBUG = DEBUG
+TEMPLATE_DEBUG = DEBUG
 
 
 ADMINS = (
@@ -94,11 +94,11 @@ STATICFILES_FINDERS = (
 SECRET_KEY = 'a8zm$)bj&k9p2$1*biby#mo5fga#8$sr4&cmz%h=vum-xkbkme'
 
 # List of callables that know how to import templates from various sources.
-#TEMPLATE_LOADERS = (
-#    'django.template.loaders.filesystem.Loader',
-#    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-#)
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+     #'django.template.loaders.eggs.Loader',
+)
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -115,15 +115,15 @@ ROOT_URLCONF = 'PythonTBC.urls'
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'PythonTBC.wsgi.application'
 
-#TEMPLATE_DIRS = (
+TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-#    join(PROJDIR, '../tbc/templates'),
-#    join(PROJDIR, '../tbc/static/uploads'),
-#    join(PROJDIR, '../comments/templates'),
-#    LOCAL_template_dirs,
-#)
+    join(PROJDIR, '../tbc/templates'),
+    join(PROJDIR, '../tbc/static/uploads'),
+    join(PROJDIR, '../comments/templates'),
+    LOCAL_template_dirs,
+)
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -145,35 +145,6 @@ INSTALLED_APPS = (
     'taggit_templatetags2',
 )
 
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-                 'join(PROJDIR, "../tbc/templates")',
-                 'join(PROJDIR, "../tbc/static/uploads")',
-                 'join(PROJDIR, "../comments/templates")',
-                 'LOCAL_template_dirs',
-],
-        #'APP_DIRS': True,
-
-        'OPTIONS': {
-            'debug': DEBUG,
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        'loaders': [
-                 'django.template.loaders.filesystem.Loader',
-                 'django.template.loaders.app_directories.Loader',
-
-],
-        },
-    },
-]
-
-
 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 473dad1..77d166a 100644
--- a/PythonTBC/urls.py
+++ b/PythonTBC/urls.py
@@ -6,7 +6,7 @@ import django.contrib.sitemaps.views
 from django.contrib import admin
 admin.autodiscover()
 
-from sitemap import TbcBookSitemap
+from .sitemap import TbcBookSitemap
 sitemaps = { 
     'book': TbcBookSitemap, 
 }