Ticket #20810: 0001-Fix-PIL-bug-when-using-EPS-file-in-ImageField.patch

django/core/files/images.py

@@ -3 +3 @@
 
 Requires Pillow (or PIL), as you might imagine.
 """
+from PIL import Image as PILImage
 import zlib
 
 from django.core.files import File
@@ -67 +68 @@
                 return p.image.size
             chunk_size = chunk_size*2
         return None
+    except IOError as e:
+        # If PIL failes to detect image dimensions, fallback and try to 
+        # open it as an standard image. Images like EPS are not recognized
+        # by _imaging C decoder but recognize by plugin system.
+        file.seek(0)
+        image = PILImage.open(file)
+        return image.size
     finally:
         if close:
             file.close()

new file tests/model_fields/mathematica.eps

@@ +1 @@
+%!PS-Adobe-2.0 EPSF-1.2
+%%BoundingBox: 0 0 288 177
+%%HiResBoundingBox: 0 0 288 177.938
+%%Creator: (Mathematica Macintosh 3.0)
+%%Title: Clipboard
+%%CreationDate: (Monday, September 11, 2000) (2:45:40 PM)
+%%DocumentNeededResources: (atend)
+%%DocumentFonts: (atend)
+%%DocumentNeededFonts: (atend)
+%%EndComments
+
+% Source: http://people.sc.fsu.edu/~jburkardt/data/eps/eps.html
+% Distributed under GNU LGPL license
+%
+gsave
+150 dict begin
+/Mfixwid true def
+/Mrot 0 def
+/Mpstart {
+    MathPictureStart
+} bind def
+/Mpend {
+    MathPictureEnd
+} bind def
+/Mscale {
+    0 1 0 1
+    5 -1 roll
+    MathScale
+} bind def
+/Plain  /Courier findfont def
+/Bold   /Courier-Bold findfont def
+/Italic /Courier-Oblique findfont def
+/MathPictureStart {
+        /Mimatrix
+         matrix currentmatrix
+        def
+        gsave
+        newpath
+        Mleft
+        Mbottom
+        translate
+        /Mtmatrix
+        matrix currentmatrix
+        def
+        Plain
+        Mfontsize scalefont
+        setfont
+        0 setgray
+        0 setlinewidth
+} bind def
+/MathPictureEnd {
+        grestore
+} bind def
+/MathSubStart {
+             Momatrix
+        Mgmatrix Mtmatrix
+        Mleft Mbottom
+        Mwidth Mheight
+        9 -2 roll
+        moveto
+        Mtmatrix setmatrix
+        currentpoint
+        Mgmatrix setmatrix
+        11 -2 roll
+        moveto
+        Mtmatrix setmatrix
+        currentpoint
+        2 copy translate
+        /Mtmatrix matrix currentmatrix def
+        /Mleft 0 def
+        /Mbottom 0 def
+        3 -1 roll
+        exch sub
+        /Mheight exch def
+        sub
+        /Mwidth exch def
+} bind def
+/MathSubEnd {
+        /Mheight exch def
+        /Mwidth exch def
+        /Mbottom exch def
+        /Mleft exch def
+        /Mtmatrix exch def
+        dup setmatrix
+        /Mgmatrix exch def
+              /Momatrix exch def
+} bind def
+/Mdot {
+        moveto
+        0 0 rlineto
+        stroke
+} bind def
+/Mtetra {
+        moveto
+        lineto
+        lineto
+        lineto
+        fill
+} bind def
+/Metetra {
+        moveto
+        lineto
+        lineto
+        lineto
+        closepath
+        gsave
+        fill
+        grestore
+        0 setgray
+        stroke
+} bind def
+/Mistroke {
+        flattenpath
+        0 0 0
+        {
+        4 2 roll
+        pop pop
+        }
+        {
+        4 -1 roll
+        2 index
+        sub dup mul
+        4 -1 roll
+        2 index
+        sub dup mul
+        add sqrt
+        4 -1 roll
+        add
+        3 1 roll
+        }
+        {
+        stop
+        }
+        {
+        stop
+        }
+        pathforall
+        pop pop
+        currentpoint
+        stroke
+        moveto
+        currentdash
+        3 -1 roll
+        add
+        setdash
+} bind def
+/Mfstroke {
+        stroke
+        currentdash
+        pop 0
+        setdash
+} bind def
+/Mrotsboxa {
+        gsave
+        dup
+        /Mrot
+        exch def
+        Mrotcheck
+        Mtmatrix
+        dup
+        setmatrix
+        7 1 roll
+        4 index
+        4 index
+        translate
+        rotate
+        3 index
+        -1 mul
+        3 index
+        -1 mul
+        translate
+        /Mtmatrix
+        matrix
+        currentmatrix
+        def
+        grestore
+        Msboxa
+        3  -1 roll
+        /Mtmatrix
+        exch def
+        /Mrot
+        0 def
+} bind def
+/Msboxa {
+        newpath
+        5 -1 roll
+        Mvboxa
+        pop
+        Mboxout
+        6 -1 roll
+        5 -1 roll
+        4 -1 roll
+        Msboxa1
+        5 -3 roll
+        Msboxa1
+        Mboxrot
+        [
+        7 -2 roll
+        2 copy
+        [
+        3 1 roll
+        10 -1 roll
+        9 -1 roll
+        ]
+        6 1 roll
+        5 -2 roll
+        ]
+} bind def
+/Msboxa1 {
+        sub
+        2 div
+        dup
+        2 index
+        1 add
+        mul
+        3 -1 roll
+        -1 add
+        3 -1 roll
+        mul
+} bind def
+/Mvboxa {
+        Mfixwid
+        {
+        Mvboxa1
+        }
+        {
+        dup
+        Mwidthcal
+        0 exch
+        {
+        add
+        }
+        forall
+        exch
+        Mvboxa1
+        4 index
+        7 -1 roll
+        add
+        4 -1 roll
+        pop
+        3 1 roll
+        }
+        ifelse
+} bind def
+/Mvboxa1 {
+        gsave
+        newpath
+        [ true
+        3 -1 roll
+        {
+        Mbbox
+        5 -1 roll
+        {
+        0
+        5 1 roll
+        }
+        {
+        7 -1 roll
+        exch sub
+        (m) stringwidth pop
+        .3 mul
+        sub
+        7 1 roll
+        6 -1 roll
+        4 -1 roll
+        Mmin
+        3 -1 roll
+        5 index
+        add
+        5 -1 roll
+        4 -1 roll
+        Mmax
+        4 -1 roll
+        }
+        ifelse
+        false
+        }
+        forall
+        { stop } if
+        counttomark
+        1 add
+        4 roll
+        ]
+        grestore
+} bind def
+/Mbbox {
+        0 0 moveto
+        false charpath
+        flattenpath
+        pathbbox
+        newpath
+} bind def
+/Mmin {
+        2 copy
+        gt
+        { exch } if
+        pop
+} bind def
+/Mmax {
+        2 copy
+        lt
+        { exch } if
+        pop
+} bind def
+/Mrotshowa {
+        dup
+        /Mrot
+        exch def
+        Mrotcheck
+        Mtmatrix
+        dup
+        setmatrix
+        7 1 roll
+        4 index
+        4 index
+        translate
+        rotate
+        3 index
+        -1 mul
+        3 index
+        -1 mul
+        translate
+        /Mtmatrix
+        matrix
+        currentmatrix
+        def
+        Mgmatrix setmatrix
+        Mshowa
+        /Mtmatrix
+        exch def
+        /Mrot 0 def
+} bind def
+/Mshowa {
+        4 -2 roll
+        moveto
+        2 index
+        Mtmatrix setmatrix
+        Mvboxa
+        7 1 roll
+        Mboxout
+        6 -1 roll
+        5 -1 roll
+        4 -1 roll
+        Mshowa1
+        4 1 roll
+        Mshowa1
+        rmoveto
+        currentpoint
+        Mfixwid
+        {
+        Mshowax
+        }
+        {
+        Mshoway
+        }
+        ifelse
+        pop pop pop pop
+        Mgmatrix setmatrix
+} bind def
+/Mshowax {
+        0 1
+        4 index length
+        -1 add
+        {
+        2 index
+        4 index
+        2 index
+        get
+        3 index
+        add
+        moveto
+        4 index
+        exch get
+        show
+        } for
+} bind def
+/Mshoway {
+        3 index
+        Mwidthcal
+        5 1 roll
+        0 1
+        4 index length
+        -1 add
+        {
+        2 index
+        4 index
+        2 index
+        get
+        3 index
+        add
+        moveto
+        4 index
+        exch get
+        [
+        6 index
+        aload
+        length
+        2 add
+        -1 roll
+        {
+        pop
+        Strform
+        stringwidth
+        pop
+        neg
+        exch
+        add
+        0 rmoveto
+        }
+        exch
+        kshow
+        cleartomark
+        } for
+        pop
+} bind def
+/Mwidthcal {
+        [
+        exch
+        {
+        Mwidthcal1
+        }
+        forall
+        ]
+        [
+        exch
+        dup
+        Maxlen
+        -1 add
+        0 1
+        3 -1 roll
+        {
+        [
+        exch
+        2 index
+        {
+        1 index
+        Mget
+        exch
+        }
+        forall
+        pop
+        Maxget
+        exch
+        }
+        for
+        pop
+        ]
+        Mreva
+} bind def
+/Mreva  {
+        [
+        exch
+        aload
+        length
+        -1 1
+        {1 roll}
+        for
+        ]
+} bind def
+/Mget   {
+        1 index
+        length
+        -1 add
+        1 index
+        ge
+        {
+        get
+        }
+        {
+        pop pop
+        0
+        }
+        ifelse
+} bind def
+/Maxlen {
+        [
+        exch
+        {
+        length
+        }
+        forall
+        Maxget
+} bind def
+/Maxget {
+        counttomark
+        -1 add
+        1 1
+        3 -1 roll
+        {
+        pop
+        Mmax
+        }
+        for
+        exch
+        pop
+} bind def
+/Mwidthcal1 {
+        [
+        exch
+        {
+        Strform
+        stringwidth
+        pop
+        }
+        forall
+        ]
+} bind def
+/Strform {
+        /tem (x) def
+        tem 0
+        3 -1 roll
+        put
+        tem
+} bind def
+/Mshowa1 {
+        2 copy
+        add
+        4 1 roll
+        sub
+        mul
+        sub
+        -2 div
+} bind def
+/MathScale {
+        Mwidth
+        Mheight
+        Mlp
+        translate
+        scale
+        /yscale exch def
+        /ybias exch def
+        /xscale exch def
+        /xbias exch def
+        /Momatrix
+        xscale yscale matrix scale
+        xbias ybias matrix translate
+        matrix concatmatrix def
+        /Mgmatrix
+        matrix currentmatrix
+        def
+} bind def
+/Mlp {
+        3 copy
+        Mlpfirst
+        {
+        Mnodistort
+        {
+        Mmin
+        dup
+        } if
+        4 index
+        2 index
+        2 index
+        Mlprun
+        11 index
+        11 -1 roll
+        10 -4 roll
+        Mlp1
+        8 index
+        9 -5 roll
+        Mlp1
+        4 -1 roll
+        and
+        { exit } if
+        3 -1 roll
+        pop pop
+        } loop
+        exch
+        3 1 roll
+        7 -3 roll
+        pop pop pop
+} bind def
+/Mlpfirst {
+        3 -1 roll
+        dup length
+        2 copy
+        -2 add
+        get
+        aload
+        pop pop pop
+        4 -2 roll
+        -1 add
+        get
+        aload
+        pop pop pop
+        6 -1 roll
+        3 -1 roll
+        5 -1 roll
+        sub
+        dup /MsaveAx exch def
+        div
+        4 1 roll
+        exch sub
+        dup /MsaveAy exch def
+        div
+} bind def
+/Mlprun {
+        2 copy
+        4 index
+        0 get
+        dup
+        4 1 roll
+        Mlprun1
+        3 copy
+        8 -2 roll
+        9 -1 roll
+        {
+        3 copy
+        Mlprun1
+        3 copy
+        11 -3 roll
+        /gt Mlpminmax
+        8 3 roll
+        11 -3 roll
+        /lt Mlpminmax
+        8 3 roll
+        } forall
+        pop pop pop pop
+        3 1 roll
+        pop pop
+        aload pop
+        5 -1 roll
+        aload pop
+        exch
+        6 -1 roll
+        Mlprun2
+        8 2 roll
+        4 -1 roll
+        Mlprun2
+        6 2 roll
+        3 -1 roll
+        Mlprun2
+        4 2 roll
+        exch
+        Mlprun2
+        6 2 roll
+} bind def
+/Mlprun1 {
+        aload pop
+        exch
+        6 -1 roll
+        5 -1 roll
+        mul add
+        4 -2 roll
+        mul
+        3 -1 roll
+        add
+} bind def
+/Mlprun2 {
+        2 copy
+        add 2 div
+        3 1 roll
+        exch sub
+} bind def
+/Mlpminmax {
+        cvx
+        2 index
+        6 index
+        2 index
+        exec
+        {
+        7 -3 roll
+        4 -1 roll
+        } if
+        1 index
+        5 index
+        3 -1 roll
+        exec
+        {
+        4 1 roll
+        pop
+        5 -1 roll
+        aload
+        pop pop
+        4 -1 roll
+        aload pop
+        [
+        8 -2 roll
+        pop
+        5 -2 roll
+        pop
+        6 -2 roll
+        pop
+        5 -1 roll
+        ]
+        4 1 roll
+        pop
+        }
+        {
+        pop pop pop
+        } ifelse
+} bind def
+/Mlp1 {
+        5 index
+        3 index sub
+        5 index
+        2 index mul
+        1 index
+        le
+        1 index
+        0 le
+        or
+        dup
+        not
+        {
+        1 index
+        3 index div
+        .99999 mul
+        8 -1 roll
+        pop
+        7 1 roll
+        }
+        if
+        8 -1 roll
+        2 div
+        7 -2 roll
+        pop sub
+        5 index
+        6 -3 roll
+        pop pop
+        mul sub
+        exch
+} bind def
+/intop 0 def
+/inrht 0 def
+/inflag 0 def
+/outflag 0 def
+/xadrht 0 def
+/xadlft 0 def
+/yadtop 0 def
+/yadbot 0 def
+/Minner {
+        outflag
+        1
+        eq
+        {
+        /outflag 0 def
+        /intop 0 def
+        /inrht 0 def
+        } if
+        5 index
+        gsave
+        Mtmatrix setmatrix
+        Mvboxa pop
+        grestore
+        3 -1 roll
+        pop
+        dup
+        intop
+        gt
+        {
+        /intop
+        exch def
+        }
+        { pop }
+        ifelse
+        dup
+        inrht
+        gt
+        {
+        /inrht
+        exch def
+        }
+        { pop }
+        ifelse
+        pop
+        /inflag
+        1 def
+} bind def
+/Mouter {
+        /xadrht 0 def
+        /xadlft 0 def
+        /yadtop 0 def
+        /yadbot 0 def
+        inflag
+        1 eq
+        {
+        dup
+        0 lt
+        {
+        dup
+        intop
+        mul
+        neg
+        /yadtop
+        exch def
+        } if
+        dup
+        0 gt
+        {
+        dup
+        intop
+        mul
+        /yadbot
+        exch def
+        }
+        if
+        pop
+        dup
+        0 lt
+        {
+        dup
+        inrht
+        mul
+        neg
+        /xadrht
+        exch def
+        } if
+        dup
+        0 gt
+        {
+        dup
+        inrht
+        mul
+        /xadlft
+        exch def
+        } if
+        pop
+        /outflag 1 def
+        }
+        { pop pop}
+        ifelse
+        /inflag 0 def
+        /inrht 0 def
+        /intop 0 def
+} bind def
+/Mboxout {
+        outflag
+        1
+        eq
+        {
+        4 -1
+        roll
+        xadlft
+        leadjust
+        add
+        sub
+        4 1 roll
+        3 -1
+        roll
+        yadbot
+        leadjust
+        add
+        sub
+        3 1
+        roll
+        exch
+        xadrht
+        leadjust
+        add
+        add
+        exch
+        yadtop
+        leadjust
+        add
+        add
+        /outflag 0 def
+        /xadlft 0 def
+        /yadbot 0 def
+        /xadrht 0 def
+        /yadtop 0 def
+        } if
+} bind def
+/leadjust {
+        (m) stringwidth pop
+        .5 mul
+} bind def
+/Mrotcheck {
+        dup
+        90
+        eq
+        {
+        yadbot
+        /yadbot
+        xadrht
+        def
+        /xadrht
+        yadtop
+        def
+        /yadtop
+        xadlft
+        def
+        /xadlft
+        exch
+        def
+        }
+        if
+        dup
+        cos
+        1 index
+        sin
+        Checkaux
+        dup
+        cos
+        1 index
+        sin neg
+        exch
+        Checkaux
+        3 1 roll
+        pop pop
+} bind def
+/Checkaux {
+        4 index
+        exch
+        4 index
+        mul
+        3 1 roll
+        mul add
+        4 1 roll
+} bind def
+/Mboxrot {
+        Mrot
+        90 eq
+        {
+        brotaux
+        4 2
+        roll
+        }
+        if
+        Mrot
+        180 eq
+        {
+        4 2
+        roll
+        brotaux
+        4 2
+        roll
+        brotaux
+        }
+        if
+        Mrot
+        270 eq
+        {
+        4 2
+        roll
+        brotaux
+        }
+        if
+} bind def
+/brotaux {
+        neg
+        exch
+        neg
+} bind def
+/Mabsproc {
+        0
+        matrix defaultmatrix
+        dtransform idtransform
+        dup mul exch
+        dup mul
+        add sqrt
+} bind def
+/Mabswid {
+        Mabsproc
+        setlinewidth
+} bind def
+/Mabsdash {
+        exch
+        [
+        exch
+        {
+        Mabsproc
+        }
+        forall
+        ]
+        exch
+        setdash
+} bind def
+/MBeginOrig { Momatrix concat} bind def
+/MEndOrig { Mgmatrix setmatrix} bind def
+/sampledsound where
+{ pop}
+{ /sampledsound {
+exch
+pop
+exch
+5 1 roll
+mul
+4 idiv
+mul
+2 idiv
+exch pop
+exch
+/Mtempproc exch def
+{ Mtempproc pop }
+repeat
+} bind def
+} ifelse
+% Here are the short operators
+/g { setgray} bind def
+/k { setcmykcolor} bind def
+/m { moveto} bind def
+/p { gsave} bind def
+/r { setrgbcolor} bind def
+/w { setlinewidth} bind def
+/C { curveto} bind def
+/F { fill} bind def
+/L { lineto} bind def
+/P { grestore} bind def
+/s { stroke} bind def
+
+/MFill {
+        0 0             moveto
+        Mwidth 0        lineto
+        Mwidth Mheight  lineto
+        0 Mheight       lineto
+        fill
+} bind def
+
+/MPlotRegion {
+        3 index
+        Mwidth mul
+        2 index
+        Mheight mul
+        translate
+        exch sub
+        Mheight mul
+        /Mheight
+        exch def
+        exch sub
+        Mwidth mul
+        /Mwidth
+        exch def
+} bind def
+
+/Mcharproc
+{
+        currentfile
+        (x)
+        readhexstring
+        pop
+        0 get
+        exch
+        div
+} bind def
+
+/Mshadeproc
+{
+        dup
+        3 1
+        roll
+        {
+        dup
+        Mcharproc
+        3 1
+        roll
+        } repeat
+        1 eq
+        {
+        setgray
+        }
+        {
+        3 eq
+        {
+        setrgbcolor
+        }
+        {
+        setcmykcolor
+        } ifelse
+        } ifelse
+} bind def
+
+/Mrectproc
+{
+        3 index
+        2 index
+        moveto
+        2 index
+        3 -1
+        roll
+        lineto
+        dup
+        3 1
+        roll
+        lineto
+        lineto
+        fill
+} bind def
+
+/Mcolorimage
+{
+        7 1
+        roll
+        pop
+        pop
+        matrix
+        invertmatrix
+        concat
+        2 exch exp
+        1 sub
+        3 1 roll
+        1 1
+        2 index
+        {
+        1 1
+        4 index
+        {
+        dup
+        1 sub
+        exch
+        2 index
+        dup
+        1 sub
+        exch
+        7 index
+        9 index
+        Mshadeproc
+        Mrectproc
+        } for
+        pop
+        } for
+        pop pop pop pop
+} bind def
+
+/Mimage
+{
+        pop
+        matrix
+        invertmatrix
+        concat
+        2 exch exp
+        1 sub
+        3 1 roll
+        1 1
+        2 index
+        {
+        1 1
+        4 index
+        {
+        dup
+        1 sub 
+        exch
+        2 index
+        dup
+        1 sub
+        exch
+        7 index
+        Mcharproc
+        setgray
+        Mrectproc
+        } for
+        pop
+        } for
+        pop pop pop
+} bind def
+/Mnodistort true def
+/colorimage where
+{ pop /Mcolorimage {colorimage} bind def /Mimage {image} bind def}
+{
+/colorimage {Mcolorimage} bind def
+} ifelse
+1.000000 1.000000 scale
+0.000000 -177.937500 translate
+1.000000 -1.000000 scale
+-0.000000 -0.000000 translate
+/Mleft          0.000000 def
+/Mbottom        0.000000 def
+/Mwidth         288.000000 def
+/Mheight        177.937500 def
+0 setgray
+0 setlinewidth
+/Courier findfont 12 scalefont setfont
+/Mfontsize 12 def
+/Plain /Courier findfont def
+
+0 Mbottom Mheight neg add 2 mul Mheight add translate
+1 -1 scale
+%!
+%%Creator: Mathematica
+%%AspectRatio: .61803 
+MathPictureStart
+/Mabs {
+Mgmatrix idtransform
+Mtmatrix dtransform
+} bind def
+/Mabsadd { Mabs
+3 -1 roll add
+3 1 roll add
+exch } bind def
+%% Graphics
+/Courier findfont 10  scalefont  setfont
+% Scaling calculations
+0.0238095 0.0952381 0.309015 0.294306 [
+[.21429 .29651 -3 -9 ]
+[.21429 .29651 3 0 ]
+[.40476 .29651 -3 -9 ]
+[.40476 .29651 3 0 ]
+[.59524 .29651 -3 -9 ]
+[.59524 .29651 3 0 ]
+[.78571 .29651 -3 -9 ]
+[.78571 .29651 3 0 ]
+[.97619 .29651 -6 -9 ]
+[.97619 .29651 6 0 ]
+[.01131 .01471 -12 -4.5 ]
+[.01131 .01471 0 4.5 ]
+[.01131 .16186 -24 -4.5 ]
+[.01131 .16186 0 4.5 ]
+[.01131 .45617 -18 -4.5 ]
+[.01131 .45617 0 4.5 ]
+[.01131 .60332 -6 -4.5 ]
+[.01131 .60332 0 4.5 ]
+[ 0 0 0 0 ]
+[ 1 .61803 0 0 ]
+] MathScale
+% Start of Graphics
+1 setlinecap
+1 setlinejoin
+newpath
+0 g
+.25 Mabswid
+[ ] 0 setdash
+.21429 .30901 m
+.21429 .31526 L
+s
+[(2)] .21429 .29651 0 1 Mshowa
+.40476 .30901 m
+.40476 .31526 L
+s
+[(4)] .40476 .29651 0 1 Mshowa
+.59524 .30901 m
+.59524 .31526 L
+s
+[(6)] .59524 .29651 0 1 Mshowa
+.78571 .30901 m
+.78571 .31526 L
+s
+[(8)] .78571 .29651 0 1 Mshowa
+.97619 .30901 m
+.97619 .31526 L
+s
+[(10)] .97619 .29651 0 1 Mshowa
+.125 Mabswid
+.07143 .30901 m
+.07143 .31276 L
+s
+.11905 .30901 m
+.11905 .31276 L
+s
+.16667 .30901 m
+.16667 .31276 L
+s
+.2619 .30901 m
+.2619 .31276 L
+s
+.30952 .30901 m
+.30952 .31276 L
+s
+.35714 .30901 m
+.35714 .31276 L
+s
+.45238 .30901 m
+.45238 .31276 L
+s
+.5 .30901 m
+.5 .31276 L
+s
+.54762 .30901 m
+.54762 .31276 L
+s
+.64286 .30901 m
+.64286 .31276 L
+s
+.69048 .30901 m
+.69048 .31276 L
+s
+.7381 .30901 m
+.7381 .31276 L
+s
+.83333 .30901 m
+.83333 .31276 L
+s
+.88095 .30901 m
+.88095 .31276 L
+s
+.92857 .30901 m
+.92857 .31276 L
+s
+.25 Mabswid
+0 .30901 m
+1 .30901 L
+s
+.02381 .01471 m
+.03006 .01471 L
+s
+[(-1)] .01131 .01471 1 0 Mshowa
+.02381 .16186 m
+.03006 .16186 L
+s
+[(-0.5)] .01131 .16186 1 0 Mshowa
+.02381 .45617 m
+.03006 .45617 L
+s
+[(0.5)] .01131 .45617 1 0 Mshowa
+.02381 .60332 m
+.03006 .60332 L
+s
+[(1)] .01131 .60332 1 0 Mshowa
+.125 Mabswid
+.02381 .04414 m
+.02756 .04414 L
+s
+.02381 .07357 m
+.02756 .07357 L
+s
+.02381 .103 m
+.02756 .103 L
+s
+.02381 .13243 m
+.02756 .13243 L
+s
+.02381 .19129 m
+.02756 .19129 L
+s
+.02381 .22072 m
+.02756 .22072 L
+s
+.02381 .25015 m
+.02756 .25015 L
+s
+.02381 .27958 m
+.02756 .27958 L
+s
+.02381 .33845 m
+.02756 .33845 L
+s
+.02381 .36788 m
+.02756 .36788 L
+s
+.02381 .39731 m
+.02756 .39731 L
+s
+.02381 .42674 m
+.02756 .42674 L
+s
+.02381 .4856 m
+.02756 .4856 L
+s
+.02381 .51503 m
+.02756 .51503 L
+s
+.02381 .54446 m
+.02756 .54446 L
+s
+.02381 .57389 m
+.02756 .57389 L
+s
+.25 Mabswid
+.02381 0 m
+.02381 .61803 L
+s
+0 0 m
+1 0 L
+1 .61803 L
+0 .61803 L
+closepath
+clip
+newpath
+.5 Mabswid
+.02381 .30902 m
+.06244 .42516 L
+.08255 .47925 L
+.10458 .52975 L
+.11448 .54875 L
+.12507 .56621 L
+.13499 .5797 L
+.14415 .58954 L
+.14901 .59372 L
+.15437 .59746 L
+.15975 .6003 L
+.1627 .60146 L
+.16546 .6023 L
+.1667 .60259 L
+.16805 .60286 L
+.16934 .60305 L
+.17052 .60319 L
+.1717 .60327 L
+.17277 .60331 L
+.174 .60332 L
+.17516 .60327 L
+.17643 .60317 L
+.17707 .6031 L
+.17777 .60301 L
+.18017 .60258 L
+.18153 .60225 L
+.18298 .60184 L
+.1856 .60091 L
+.19088 .59838 L
+.19577 .59525 L
+.20684 .58538 L
+.21659 .57358 L
+.22696 .55801 L
+.26471 .47813 L
+.30491 .3646 L
+.3436 .24588 L
+.38474 .13133 L
+.40527 .08527 L
+.41527 .06645 L
+.42436 .05167 L
+.4332 .03954 L
+.44279 .02902 L
+.44806 .02443 L
+.45291 .02098 L
+.45756 .01838 L
+.46247 .01637 L
+.465 .01565 L
+.46625 .01537 L
+.4674 .01515 L
+.46853 .01498 L
+Mistroke
+.46956 .01486 L
+.4707 .01477 L
+.47191 .01472 L
+.47322 .01472 L
+.47442 .01476 L
+.47574 .01487 L
+.4764 .01494 L
+.47713 .01504 L
+.47836 .01525 L
+.47968 .01552 L
+.48205 .01615 L
+.48441 .01696 L
+.48697 .01805 L
+.49163 .02056 L
+.50036 .02711 L
+.50978 .03685 L
+.52017 .05066 L
+.54119 .08778 L
+.58145 .18687 L
+.62019 .30277 L
+.66138 .42668 L
+.68195 .48175 L
+.70106 .52578 L
+.71952 .56007 L
+.72977 .57512 L
+.73922 .58626 L
+.74949 .59527 L
+.75489 .59869 L
+.75765 .60007 L
+.7606 .60129 L
+.7632 .60212 L
+.76557 .60269 L
+.76671 .6029 L
+.76795 .60308 L
+.76913 .6032 L
+.77021 .60328 L
+.77147 .60332 L
+.77264 .60331 L
+.77393 .60325 L
+.77466 .60319 L
+.77533 .60312 L
+.77659 .60295 L
+.77798 .6027 L
+.78077 .60202 L
+.7833 .60118 L
+.78604 .60004 L
+.79103 .59735 L
+.80035 .5902 L
+.81125 .57845 L
+.8213 .56447 L
+Mistroke
+.84004 .53097 L
+.86067 .48425 L
+.90097 .37167 L
+.93977 .25263 L
+.97619 .14891 L
+Mfstroke
+% End of Graphics
+MathPictureEnd
+%%PSTrailer
+end
+grestore
+showpage
+%%EPS Trailer

tests/model_fields/test_imagefield.py

@@ -54 +54 @@
         file_path2 = os.path.join(os.path.dirname(upath(__file__)), "8x4.png")
         self.file2 = self.File(open(file_path2, 'rb'))
 
+        eps_file_path = os.path.join(os.path.dirname(upath(__file__)),
+                                     "mathematica.eps")
+        self.eps_file = self.File(open(eps_file_path, 'rb'))
+
     def tearDown(self):
         """
         Removes temp directory and all its contents.
@@ -436 +440 @@
         # Dimensions were recalculated, and hence file should have opened.
         self.assertEqual(p.mugshot.was_opened, True)
         self.assertEqual(p.headshot.was_opened, True)
+
+
+@skipIf(Image is None, "PIL is required to test ImageField")
+class ImageFieldEPSTests(ImageFieldTestMixin, TestCase):
+    """
+    Test EPS support of ImageField
+    """
+
+    PersonModel = Person
+    EPS_WIDTH, EPS_HEIGHT = 288, 177
+
+    def test_constructor(self):
+        p = self.PersonModel(mugshot=self.eps_file)
+        self.check_dimensions(p, self.EPS_WIDTH, self.EPS_HEIGHT, 'mugshot')
+        p.save()
+        self.check_dimensions(p, self.EPS_WIDTH, self.EPS_HEIGHT, 'mugshot')