From c6ea4ed5d23671deee6e736fe1daba2c650a4fbb Mon Sep 17 00:00:00 2001 From: Jaap Roes Date: Fri, 27 Nov 2015 17:19:19 +0100 Subject: [PATCH] Fixed #25825 -- Implemented __ne__() for template Origin --- django/template/base.py | 3 +++ tests/template_tests/test_origin.py | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 tests/template_tests/test_origin.py diff --git a/django/template/base.py b/django/template/base.py index bbae6a408d..ce2c970378 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -151,6 +151,9 @@ class Origin(object): self.loader == other.loader ) + def __ne__(self, other): + return not self.__eq__(other) + @property def loader_name(self): if self.loader: diff --git a/tests/template_tests/test_origin.py b/tests/template_tests/test_origin.py new file mode 100644 index 0000000000..0e9ee8b1e0 --- /dev/null +++ b/tests/template_tests/test_origin.py @@ -0,0 +1,24 @@ +from unittest import TestCase + +from django.template import Engine + +from .utils import TEMPLATE_DIR + + +class OriginTestCase(TestCase): + def setUp(self): + self.engine = Engine(dirs=[TEMPLATE_DIR]) + + def test_origin_compares_equal(self): + a = self.engine.get_template('index.html') + b = self.engine.get_template('index.html') + self.assertEqual(a.origin, b.origin) + self.assertTrue(a.origin == b.origin) + self.assertFalse(a.origin != b.origin) + + def test_origin_compares_not_equal(self): + a = self.engine.get_template('first/test.html') + b = self.engine.get_template('second/test.html') + self.assertNotEqual(a.origin, b.origin) + self.assertFalse(a.origin == b.origin) + self.assertTrue(a.origin != b.origin)