unicode: Implemented comparisons between *_lazy() objects. comparing

ugettext_lazy() instances to each other now works, for example.


git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5489 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 29 insertions, 1 deletions

diff --git a/django/utils/functional.py b/django/utils/functional.py
index cd34809837..574f433fd5 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -64,6 +64,18 @@ def lazy(func, *resultclasses):
             else:
                 return Promise.__str__(self)
 
+        def __cmp__(self, rhs):
+            if self._delegate_str:
+                s = str(self.__func(*self.__args, **self.__kw))
+            elif self._delegate_unicode:
+                s = unicode(self.__func(*self.__args, **self.__kw))
+            else:
+                s = self.__func(*self.__args, **self.__kw)
+            if isinstance(rhs, Promise):
+                return -cmp(rhs, s)
+            else:
+                return cmp(s, rhs)
+
         def __mod__(self, rhs):
             if self._delegate_str:
                 return str(self) % rhs
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index 278957dad4..8a7d2bee3e 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -1,7 +1,9 @@
 # coding: utf-8
 
 ur"""
->>> from django.utils.translation import ugettext_lazy, activate, deactivate
+Format string interpolation should work with *_lazy objects.
+
+>>> from django.utils.translation import ugettext_lazy, activate, deactivate, gettext_lazy
 >>> s = ugettext_lazy('Add %(name)s')
 >>> d = {'name': 'Ringo'}
 >>> s % d
@@ -14,4 +16,18 @@ u'Ringo hinzuf\xfcgen'
 u'Dodaj Ringo'
 >>> deactivate()
 
+It should be possible to compare *_lazy objects.
+
+>>> s1 = ugettext_lazy('Add %(name)s')
+>>> s == s1
+True
+>>> s2 = gettext_lazy('Add %(name)s')
+>>> s3 = gettext_lazy('Add %(name)s')
+>>> s2 == s3
+True
+>>> s == s2
+True
+>>> s4 = ugettext_lazy('Some other string')
+>>> s == s4
+False
 """