summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaap Roes <jroes@leukeleu.nl>2015-11-27 17:19:19 +0100
committerTim Graham <timograham@gmail.com>2015-12-03 15:59:34 -0500
commitc6ea4ed5d23671deee6e736fe1daba2c650a4fbb (patch)
tree5073809ebc892daa94a1eb8223fe47b744159802
parent395af23ac1f3499b21eba5ca085200bfce251290 (diff)
Fixed #25825 -- Implemented __ne__() for template Origin
-rw-r--r--django/template/base.py3
-rw-r--r--tests/template_tests/test_origin.py24
2 files changed, 27 insertions, 0 deletions
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)