Django

Code

Changeset 8257

Show
Ignore:
Timestamp:
08/09/08 09:18:09 (4 months ago)
Author:
jacob
Message:

Fixed #8187: made PIL imports consistant. Thanks, bastih.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/tests/modeltests/model_forms/models.py

    r8244 r8257  
    7676        # for PyPy, you need to check for the underlying modules 
    7777        # If PIL is not available, this test is equivalent to TextFile above. 
    78         import Image, _imaging 
     78        from PIL import Image, _imaging 
    7979        image = models.ImageField(storage=temp_storage, upload_to='tests') 
    8080    except ImportError: 

  • django/trunk/tests/regressiontests/file_storage/models.py

    r8244 r8257  
    1313    # Checking for the existence of Image is enough for CPython, but 
    1414    # for PyPy, you need to check for the underlying modules 
    15     import Image, _imaging 
     15    from PIL import Image, _imaging 
    1616except ImportError: 
    1717    Image = None