test_client_regress.models.UploadedFileEncodingTest fails if the mimetypes.guess_type() guesses an alternate zip mimetype

[Johannes Dollinger]

FAIL: test_guesses_content_type_on_file_encoding (regressiontests.test_client_regress.models.UploadedFileEncodingTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/emulbreh/Projekte/django-dev/trunk/tests/regressiontests/test_client_regress/models.py", line 847, in test_guesses_content_type_on_file_encoding
    encode_file('IGNORE', 'IGNORE', DummyFile("file.zip"))[2])
AssertionError: 'Content-Type: application/zip' != 'Content-Type: application/x-zip-compressed'

[Russell Keith-Magee]

In addition to application/x-zip-compressed, we should probably also be catching application/x-zip and application/x-compress. They're edge cases too; we might as well catch them while we're at it.

Marking RFC though, because adding the extra types into the patch is a trivial modification.

[Jannis Leidel]

(In [15236]) Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh.

[Jannis Leidel]

(In [15237]) [1.2.X] Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh.

Backport from trunk (r15236).