Merge branch 'pm/support_dj11_and_dj20' into pm/insane_integration_test

# Conflicts:
#	.travis.yml

Author: Pamela McA'Nulty

.travis.yml

@@ -5,14 +5,5 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-env:
-  - DJANGO="1.4"
-  - DJANGO="1.5"
-  - DJANGO="1.6"
-  - DJANGO="1.7"
-  - DJANGO="1.8"
-  - DJANGO="1.9"
-  - DJANGO="1.10"
-
 install: pip install tox-travis
 script: tox

AUTHORS.txt

@@ -3,3 +3,4 @@ contributions by:
 
 Jessamyn Smith
 Simon Charette
+Pamela McA'Nulty

Makefile

@@ -29,7 +29,4 @@ kit:
 	$(SDIST_CMD)
 
 kit_upload:
-	$(SDIST_CMD) upload
-
-pypi:
-	python setup.py register
+	twine upload dist/*

NOTICE.txt

@@ -1,4 +1,4 @@
-Copyright 2015-2016 Ned Batchelder.  All rights reserved.
+Copyright 2015-2017 Ned Batchelder.  All rights reserved.
 
 Except where noted otherwise, this software is licensed under the Apache
 License, Version 2.0 (the "License"); you may not use this work except in

README.rst

@@ -8,10 +8,16 @@ Django Template Coverage.py Plugin
 A `coverage.py`_ plugin to measure the coverage of Django templates.
 
 | |license| |versions| |djversions| |status|
-| |kit| |downloads|
+| |kit|
+
+.. downloads badge seems to be broken... |downloads|
+
+Supported Python versions are 2.7, 3.4, 3.5 and 3.6.
+
+Supported Django versions are 1.4 through 1.10.
+
+Supported coverage.py versions are 4.0 and higher.
 
-Supported Python versions are 2.7, 3.4, and 3.5.  Supported Django versions are
-1.4 through 1.9.
 
 The plugin is pip installable::
 
@@ -23,7 +29,7 @@ To run it, add this setting to your .coveragerc file::
     plugins =
         django_coverage_plugin
 
-Then run your tests under coverage.py. It requires coverage.py 4.0 or later.
+Then run your tests under coverage.py.
 
 You will see your templates listed in your coverage report along with your
 Python modules.
@@ -43,6 +49,8 @@ template files are included in the report.
 Caveats
 ~~~~~~~
 
+Support for Django versions 1.4 through 1.7 should be considered deprecated.
+
 Files included by the ``{% ssi %}`` tag are not included in the coverage
 measurements.
 
@@ -54,6 +62,30 @@ Changes
 ~~~~~~~
 
 
+v1.4.1 --- 2017-01-25
+---------------------
+
+Fixes `issue 32`_, which was the result of an initialization order problem.
+
+.. _issue 32: https://github.com/nedbat/django_coverage_plugin/issues/32
+
+
+v1.4 --- 2017-01-16
+-------------------
+
+Django 1.10.5 is now supported.
+
+Checking settings configuration is deferred so that settings.py is included
+in coverage reporting.  Fixes `issue 28`_.
+
+Only the ``django.template.backends.django.DjangoTemplates`` template engine is
+supported, and it must be configured with ``['OPTIONS']['debug'] = True``.
+Fixes `issue 27`_.
+
+.. _issue 28: https://github.com/nedbat/django_coverage_plugin/issues/28
+.. _issue 27: https://github.com/nedbat/django_coverage_plugin/issues/27
+
+
 v1.3.1 --- 2016-06-02
 ---------------------
 
@@ -140,7 +172,7 @@ To run the tests::
 .. |versions| image:: https://img.shields.io/pypi/pyversions/django_coverage_plugin.svg
     :target: https://pypi.python.org/pypi/django_coverage_plugin
     :alt: Python versions supported
-.. |djversions| image:: https://img.shields.io/badge/Django-1.4, 1.5, 1.6, 1.7, 1.8, 1.9-44b78b.svg
+.. |djversions| image:: https://img.shields.io/badge/Django-1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 1.10-44b78b.svg
     :target: https://pypi.python.org/pypi/django_coverage_plugin
     :alt: Django versions supported
 .. |status| image:: https://img.shields.io/pypi/status/django_coverage_plugin.svg

django_coverage_plugin/plugin.py

@@ -13,7 +13,6 @@
 
 import django
 import django.template
-from django.core.exceptions import ImproperlyConfigured
 from django.template.base import (
     Lexer, TextNode, NodeList, Template,
     TOKEN_BLOCK, TOKEN_MAPPING, TOKEN_TEXT, TOKEN_VAR,
@@ -43,28 +42,34 @@ def check_debug():
     to do its work.  Check that the setting is correct, and raise an exception
     if it is not.
 
+    Returns True if the debug check was performed, False otherwise
     """
-    # The settings for templates changed in Django 1.8 from TEMPLATE_DEBUG to
-    # TEMPLATES[..]['debug'].  Django 1.9 tolerated both forms, 1.10 insists on
-    # the new form.  Don't try to be version-specific here.  If the new
-    # settings exist, use them, otherwise use the old.
-
     from django.conf import settings
 
-    try:
-        templates = getattr(settings, 'TEMPLATES', [])
-    except ImproperlyConfigured:
-        # Maybe there are no settings at all.  We are fine with this.  Our
-        # code will need settings, but if this program we're in runs without
-        # settings, then it must be that it never uses templates, and our code
-        # will never try to use the settings anyway.
-        return
-
-    if templates:
-        for template_settings in templates:
-            if template_settings['BACKEND'] != 'django.template.backends.django.DjangoTemplates':
-                raise DjangoTemplatePluginException("Can't use non-Django templates.")
-            if not template_settings.get('OPTIONS', {}).get('debug', False):
+    if not settings.configured:
+        return False
+
+    if django.VERSION >= (1, 8):
+        # Django 1.8+ handles both old and new-style settings and converts them
+        # into template engines, so we don't need to depend on settings values
+        # directly and can look at the resulting configured objects
+
+        # django.template.backends.django gets loaded lazily, so return false
+        # until they've been loaded
+        if not hasattr(django.template, "backends"):
+            return False
+        if not hasattr(django.template.backends, "django"):
+            return False
+
+        if not hasattr(django.template.backends.django, "DjangoTemplates"):
+            raise DjangoTemplatePluginException("Can't use non-Django templates.")
+
+        for engine in django.template.engines.all():
+            if not isinstance(engine, django.template.backends.django.DjangoTemplates):
+                raise DjangoTemplatePluginException(
+                    "Can't use non-Django templates."
+                )
+            if not engine.engine.debug:
                 raise DjangoTemplatePluginException(
                     "Template debugging must be enabled in settings."
                 )
@@ -75,6 +80,8 @@ def check_debug():
                 "Template debugging must be enabled in settings."
             )
 
+    return True
+
 
 if django.VERSION >= (1, 9):
     # Since we are grabbing at internal details, we have to adapt as they
@@ -151,8 +158,9 @@ def sys_info(self):
     def file_tracer(self, filename):
         if filename.startswith(self.django_template_dir):
             if not self.debug_checked:
-                check_debug()
-                self.debug_checked = True
+                # Keep calling check_debug until it returns True, which it
+                # will only do after settings have been configured
+                self.debug_checked = check_debug()
 
             return self
         return None

howto.txt

@@ -6,5 +6,4 @@
 - Update README.rst with latest changes
 - Kits:
     $ make kit
-    $ make pypi
     $ make kit_upload

requirements.txt

@@ -1,2 +1,3 @@
 # To run tests, we just need tox.
 tox >= 1.8
+twine

setup.py

@@ -12,6 +12,7 @@
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
+Programming Language :: Python :: 3.6
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: PyPy
 Topic :: Software Development :: Quality Assurance
@@ -21,7 +22,7 @@
 
 setup(
     name='django_coverage_plugin',
-    version='1.3.1',
+    version='1.4.1',
     description='Django template coverage.py plugin',
     author='Ned Batchelder',
     author_email='[email protected]',

tests/__init__.py

@@ -12,6 +12,7 @@ def index(request):
     """A bogus view to use in the urls below."""
     pass
 
+
 urlpatterns = [
     url(r'^home$', index, name='index'),
 ]