Django 1.8 port: move markov templates to app dir

dr_botzo/dr_botzo/settings.py

@@ -58,7 +58,7 @@ ROOT_URLCONF = 'dr_botzo.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [

dr_botzo/markov/views.py

@@ -1,7 +1,4 @@
-"""
-markov/views.py --- manipulate markov data
-
-"""
+"""Manipulate Markov data via the Django site."""
 
 import logging
 import random
@@ -16,7 +13,7 @@ from markov.forms import LogUploadForm, TeachLineForm
 from markov.models import MarkovContext, MarkovTarget, MarkovState
 
 
-log = logging.getLogger('dr_botzo.markov')
+log = logging.getLogger('markov.views')
 
 
 def index(request):
@@ -33,9 +30,9 @@ def context_index(request, context_id):
     chain = u" ".join(_generate_line(context))
     end_t = time.time()
 
-    return render(request, 'markov/context.html', {'chain': chain,
-                                                   'context': context,
-                                                   'elapsed': end_t - start_t})
+    return render(request, 'context.html', {'chain': chain,
+                                            'context': context,
+                                            'elapsed': end_t - start_t})
 
 
 @permission_required('import_log_file', raise_exception=True)
@@ -75,7 +72,7 @@ def import_file(request):
     else:
         form = LogUploadForm()
 
-    return render(request, 'markov/import_file.html', {'form': form})
+    return render(request, 'import_file.html', {'form': form})
 
 
 @permission_required('teach_line', raise_exception=True)
@@ -93,7 +90,7 @@ def teach_line(request):
     else:
         form = TeachLineForm()
 
-    return render(request, 'markov/teach_line.html', {'form': form})
+    return render(request, 'teach_line.html', {'form': form})
 
 
 def _generate_sentence(context, topics=None, max_words=30):
@@ -219,5 +216,3 @@ def _learn_line(line, context):
 
         if i > len(words) - 4:
             break
-
-# vi:tabstop=4:expandtab:autoindent