[Changeset] r9648 - in django/branches/releases/1.0.X: django/db/models/fields tests/regressiontests/file_storage

[noreply]

Author: mtredinnick
Date: 2008-12-15 22:54:29 -0600 (Mon, 15 Dec 2008)
New Revision: 9648

Added:
   django/branches/releases/1.0.X/tests/regressiontests/file_storage/test1.png
Modified:
   django/branches/releases/1.0.X/django/db/models/fields/files.py
   django/branches/releases/1.0.X/tests/regressiontests/file_storage/models.py
Log:
[1.0.X] Fixed #9786 -- Fixed inequality checking for 
django.db.models.fields.file.FieldFile class.

Backport of r9647 from trunk.


Modified: django/branches/releases/1.0.X/django/db/models/fields/files.py
===================================================================
--- django/branches/releases/1.0.X/django/db/models/fields/files.py     
2008-12-16 04:52:55 UTC (rev 9647)
+++ django/branches/releases/1.0.X/django/db/models/fields/files.py     
2008-12-16 04:54:29 UTC (rev 9648)
@@ -29,6 +29,9 @@
             return self.name == other.name
         return self.name == other
 
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     # The standard File contains most of the necessary properties, but
     # FieldFiles can be instantiated without a name, so that needs to
     # be checked for here.

Modified: 
django/branches/releases/1.0.X/tests/regressiontests/file_storage/models.py
===================================================================
--- django/branches/releases/1.0.X/tests/regressiontests/file_storage/models.py 
2008-12-16 04:52:55 UTC (rev 9647)
+++ django/branches/releases/1.0.X/tests/regressiontests/file_storage/models.py 
2008-12-16 04:54:29 UTC (rev 9648)
@@ -22,12 +22,12 @@
 if Image:
     class Person(models.Model):
         name = models.CharField(max_length=50)
-        mugshot = models.ImageField(storage=temp_storage, upload_to='tests', 
-                                    height_field='mug_height', 
+        mugshot = models.ImageField(storage=temp_storage, upload_to='tests',
+                                    height_field='mug_height',
                                     width_field='mug_width')
         mug_height = models.PositiveSmallIntegerField()
         mug_width = models.PositiveSmallIntegerField()
-        
+
     __test__ = {'API_TESTS': """
 
 >>> image_data = open(os.path.join(os.path.dirname(__file__), "test.png"), 
 >>> 'rb').read()
@@ -42,6 +42,18 @@
 >>> p.mug_width
 16
 
+# Bug #9786: Ensure '==' and '!=' work correctly.
+>>> image_data = open(os.path.join(os.path.dirname(__file__), "test1.png"), 
'rb').read()
+>>> p1 = Person(name="Bob")
+>>> p1.mugshot.save("mug", ContentFile(image_data))
+>>> p2 = Person.objects.get(name="Joe")
+>>> p.mugshot == p2.mugshot
+True
+>>> p.mugshot != p2.mugshot
+False
+>>> p.mugshot != p1.mugshot
+True
+
 # Bug #8175: correctly delete files that have been removed off the file system.
 >>> import os
 >>> p2 = Person(name="Fred")
@@ -69,4 +81,4 @@
 
 >>> shutil.rmtree(temp_storage_dir)
 """}
-    
\ No newline at end of file
+

Added: 
django/branches/releases/1.0.X/tests/regressiontests/file_storage/test1.png
===================================================================
--- django/branches/releases/1.0.X/tests/regressiontests/file_storage/test1.png 
                        (rev 0)
+++ django/branches/releases/1.0.X/tests/regressiontests/file_storage/test1.png 
2008-12-16 04:54:29 UTC (rev 9648)
@@ -0,0 +1,6 @@
+�PNG
+
+
+IHDR��h6
sRGB���
�IDAT(�clH(�tc 
l9������X���������Ȅ&΄U�?��3=,�<���k��m������V
+���g���?ß? ������ǿ���g``�������
+�8�8�5���o���kn~��-�~��������Z��Ǝ�aɞ5�7.`af 
����_�s����~���6'm9����!�#<�/���aٞ���b```��z(���AIRT 
4��200�z=�`f�;)�ѯu�-�w_�{M���ן�
?~����?33�...@of&��{��{��񫧜��bR�^=a``���bea�~V~V������/3˿���f�000���8FFFf��������s�#S�K0BW⃤��'vˋ������D$�d��j`fb֔S�G�+�M�R�$IEND�B`�
\ No newline at end of file


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---