Verified Commit a088daa3 authored by Michael R. Crusoe's avatar Michael R. Crusoe 🏳️‍🌈
Browse files

fix imports for Python Imaging Library

parent 749567b8

debian/changelog

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ mgltools-pmv (1.5.7-4) UNRELEASED; urgency=medium 
  * Team upload.

  * Include missing dependency on mgltools-volume



 -- Michael R. Crusoe <michael@debian>  Mon, 04 Feb 2019 15:18:27 +0200

 -- Michael R. Crusoe <michael.crusoe@gmail.com>  Mon, 04 Feb 2019 15:18:27 +0200



mgltools-pmv (1.5.7-3) unstable; urgency=medium

debian/control

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ XS-Autobuild: yes 
Priority: optional

Build-Depends: debhelper (>= 11~),

               python-all,

               python-pil,

               dh-python

Standards-Version: 4.3.0

Vcs-Browser: https://salsa.debian.org/med-team/mgltools-pmv
@@ -29,7 +30,8 @@ Depends: ${shlibs:Depends}, 
         mgltools-geomutils,

         python-pil.imagetk,

         mgltools-utpackages,

         mgltools-volume

         mgltools-volume,

         python-pil

Recommends: apbs,

            autodocktools

Suggests: mgltools-qslimlib,

debian/patches/fix_imports

0 → 100644
+291 −0
Original line number Diff line number Diff line 
From: Michael R. Crusoe <michael.crusoe@gmail.com>

Subject: fix imports for Python Imaging Library

--- mgltools-pmv.orig/Pmv/Macros/contourMac.py

+++ mgltools-pmv/Pmv/Macros/contourMac.py

@@ -1,5 +1,5 @@

-import Image

-import ImageFilter

+from PIL import Image

+from PIL import ImageFilter

 from opengltk.OpenGL import GL

 import math

 import numpy

--- mgltools-pmv.orig/Pmv/Tests/Data/clouds/alphaband_pmv.py

+++ mgltools-pmv/Pmv/Tests/Data/clouds/alphaband_pmv.py

@@ -1,4 +1,4 @@

-import Image

+from PIL import Image

 import numpy

 from DejaVu.Texture import Texture

 from DejaVu.IndexedPolygons import IndexedPolygons

--- mgltools-pmv.orig/Pmv/Tests/test_Misc.py

+++ mgltools-pmv/Pmv/Tests/test_Misc.py

@@ -117,7 +117,7 @@

 

         self.mv.GUI.setGeom(20,20,730,600)

 

-        import Image

+        from PIL import Image

         import numpy

         from DejaVu.Texture import Texture

         from DejaVu.IndexedPolygons import IndexedPolygons

--- mgltools-pmv.orig/Pmv/hostappInterface/Chimera/chimeraHelper.py

+++ mgltools-pmv/Pmv/hostappInterface/Chimera/chimeraHelper.py

@@ -2551,7 +2551,7 @@

         count = count + 1

 

 def updateImage(mv,dialog,order=[3, 3, 1, 2]):#[1, 2, 3, 1]

-    import Image

+    from PIL import Image

     cam = mv.art.arcontext[0].cam

     cam.lock.acquire()

     im = Image.fromstring('RGBA',(mv.art.video.width,mv.art.video.height),

--- mgltools-pmv.orig/Pmv/hostappInterface/Template/helperTemplate.py

+++ mgltools-pmv/Pmv/hostappInterface/Template/helperTemplate.py

@@ -2735,7 +2735,7 @@

 ##im = Image.open(StringIO.StringIO(buffer))

 ##helper.updateImage(self,viewport=Right,order=[1, 2, 3, 1])

 #def updateImage(mv,viewport=None,order=[1, 2, 3, 1]):

-#    import Image

+#    from PIL import Image

 #    cam = mv.art.arcontext[0].cam

 #    mv.art.arcontext[0].cam.lock.acquire()

 #    #array = numpy.array(cam.im_array[:])    

@@ -2754,7 +2754,7 @@

 #    #cam.lock.acquire()

 #    #dialog.keyModel.Set(imarray=cam.im_array.copy())

 #    #cam.lock.release()

-#    #import Image

+#    #from PIL import Image

 #    cam = mv.art.arcontext[0].cam

 #    mv.art.arcontext[0].cam.lock.acquire()

 #    array = numpy.array(cam.im_array[:])

--- mgltools-pmv.orig/Pmv/hostappInterface/blender/test/test_detection_video.py

+++ mgltools-pmv/Pmv/hostappInterface/blender/test/test_detection_video.py

@@ -84,9 +84,9 @@

 import numpy

 import PyARTK

 from PyARTK import video,arparamlib,arlib,utils,glutils

-import Image

+from PIL import Image

 import Tkinter

-import ImageTk

+from PIL import ImageTk

 import Blender

 from Blender import *

 from Blender import Window, Scene, Draw

@@ -103,9 +103,9 @@

     import numpy

     import PyARTK

     from PyARTK import video,arparamlib,arlib,utils,glutils

-    import Image

+    from PIL import Image

     import Tkinter

-    import ImageTk

+    from PIL import ImageTk

     self.matrix=None

     self.trackedObj=trackedObj

 	

@@ -203,9 +203,9 @@

         import numpy

         import PyARTK

         from PyARTK import video,arparamlib,arlib,utils,glutils

-        import Image

+        from PIL import Image

         import Tkinter

-        import ImageTk

+        from PIL import ImageTk

         from Blender import Mathutils

     #try:

      

@@ -350,7 +350,7 @@

  

 #run test_detection_video

 #im_array = vid.videoApp.cam.im_array

-#import Image as I

+#from PIL import Image as I

 #im = I.fromstring(vid.pixel_format,(vid.width,vid.height),im_array.tostring())

 #data=list(im.getdata())

 #for y in range(vid.height-1):

--- mgltools-pmv.orig/Pmv/hostappInterface/cinema4d/helperC4D.py

+++ mgltools-pmv/Pmv/hostappInterface/cinema4d/helperC4D.py

@@ -3220,7 +3220,7 @@

     try :

         if viewport is not None :

             viewport[c4d.symbols.BASEDRAW_DATA_SHOWPICTURE] = bool(mv.art.AR.show_tex)

-        import Image

+        from PIL import Image

         cam = mv.art.arcontext[0].cam

         cam.lock.acquire()

         #print "acquire"

@@ -3250,7 +3250,7 @@

         new = Image.merge("RGBA", (rgba[order[0]],rgba[order[1]],rgba[order[2]],rgba[order[3]]))

         #print "save"

         if mv.art.patternMgr.mirror :

-            import ImageOps

+            from PIL import ImageOps

             im=ImageOps.mirror(pilImage)

             imf=ImageOps.flip(im)

             imf.save("/tmp/arpmv.jpg")

@@ -3268,7 +3268,7 @@

     #cam.lock.acquire()

     #dialog.keyModel.Set(imarray=cam.im_array.copy())

     #cam.lock.release()

-    #import Image

+    #from PIL import Image

     cam = mv.art.arcontext[0].cam

     mv.art.arcontext[0].cam.lock.acquire()

     array = numpy.array(cam.im_array[:])

--- mgltools-pmv.orig/Pmv/hostappInterface/cinema4d/test/test_arvideo.py

+++ mgltools-pmv/Pmv/hostappInterface/cinema4d/test/test_arvideo.py

@@ -57,9 +57,9 @@

 #sys.path.append(MGL_ROOT+'/lib/python2.5/site-packages/PIL')

 

 from PyARTK import video,arparamlib,arlib,utils

-import Image

+from PIL import Image

 #import Tkinter

-#import ImageTk

+#from PIL import ImageTk

 import c4d

 

 class video_tk:

@@ -118,7 +118,7 @@

         

   def doitonce(self):

     self.videoApp.lock.acquire()

-    import Image

+    from PIL import Image

     if sys.platform == 'darwin':

           im_array = utils.convert_ARGB_RGBA(self.videoApp.cam.im_array)

     else:

--- mgltools-pmv.orig/Pmv/hostappInterface/cinema4d_dev/helperC4D.py

+++ mgltools-pmv/Pmv/hostappInterface/cinema4d_dev/helperC4D.py

@@ -3569,7 +3569,7 @@

     try :

         if viewport is not None :

             viewport[c4d.BASEDRAW_DATA_SHOWPICTURE] = bool(mv.art.AR.show_tex)

-        import Image

+        from PIL import Image

         cam = mv.art.arcontext[0].cam

         cam.lock.acquire()

         #print "acquire"

@@ -3599,7 +3599,7 @@

         new = Image.merge("RGBA", (rgba[order[0]],rgba[order[1]],rgba[order[2]],rgba[order[3]]))

         #print "save"

         if mv.art.patternMgr.mirror :

-            import ImageOps

+            from PIL import ImageOps

             im=ImageOps.mirror(pilImage)

             imf=ImageOps.flip(im)

             imf.save("/tmp/arpmv.jpg")

@@ -3617,7 +3617,7 @@

     #cam.lock.acquire()

     #dialog.keyModel.Set(imarray=cam.im_array.copy())

     #cam.lock.release()

-    #import Image

+    #from PIL import Image

     cam = mv.art.arcontext[0].cam

     mv.art.arcontext[0].cam.lock.acquire()

     array = numpy.array(cam.im_array[:])

--- mgltools-pmv.orig/Pmv/hostappInterface/houdini/houdiniHelper.py

+++ mgltools-pmv/Pmv/hostappInterface/houdini/houdiniHelper.py

@@ -3128,7 +3128,7 @@

 ##im = Image.open(StringIO.StringIO(buffer))

 ##helper.updateImage(self,viewport=Right,order=[1, 2, 3, 1])

 #def updateImage(mv,viewport=None,order=[1, 2, 3, 1]):

-#    import Image

+#    from PIL import Image

 #    cam = mv.art.arcontext[0].cam

 #    mv.art.arcontext[0].cam.lock.acquire()

 #    #array = numpy.array(cam.im_array[:])    

@@ -3147,7 +3147,7 @@

 #    #cam.lock.acquire()

 #    #dialog.keyModel.Set(imarray=cam.im_array.copy())

 #    #cam.lock.release()

-#    #import Image

+#    #from PIL import Image

 #    cam = mv.art.arcontext[0].cam

 #    mv.art.arcontext[0].cam.lock.acquire()

 #    array = numpy.array(cam.im_array[:])

--- mgltools-pmv.orig/Pmv/hostappInterface/install_plugin.py

+++ mgltools-pmv/Pmv/hostappInterface/install_plugin.py

@@ -78,7 +78,7 @@

 

 try:

     from Tkinter import *

-    import Image, ImageTk

+    from PIL import Image, ImageTk

     from tkFileDialog   import askdirectory

     from mglutil.gui.BasicWidgets.Tk.progressBar import ProgressBar

     from mglutil.gui.BasicWidgets.Tk.multiButton import MultiRadiobuttons

--- mgltools-pmv.orig/Pmv/stylesCommands.py

+++ mgltools-pmv/Pmv/stylesCommands.py

@@ -63,7 +63,7 @@

 

     def loadStyles(self):

         # find the location fo the styles directory

-        import Image, ImageTk

+        from PIL import Image, ImageTk

         from Pmv import styles

         path = styles.__path__[0]

         from glob import glob

--- mgltools-pmv.orig/Pmv/beadedRibbonsCommands.py

+++ mgltools-pmv/Pmv/beadedRibbonsCommands.py

@@ -10,7 +10,8 @@

 import numpy

 import os, sys

 import Tkinter, tkMessageBox

-import Pmw, ImageTk

+import Pmw

+from PIL import ImageTk

 

 from Pmv.mvCommand import MVCommand

 from ViewerFramework.VFCommand import CommandGUI

--- mgltools-pmv.orig/Pmv/dashboard.py

+++ mgltools-pmv/Pmv/dashboard.py

@@ -7,6 +7,8 @@

 from MolKit.molecule import MolecularSystem

 import Pmw, Tkinter, os, sys, string

 

+from pil import ImageTk

+

 from MolKit.stringSelector import CompoundStringSelector

 from MolKit.molecule import MoleculeSet, Molecule

 from MolKit.listSet import ListSet

@@ -1511,7 +1513,8 @@

 #####################################################################

 ColumnDescriptors = []

 

-import Pmv, os, ImageTk

+import Pmv, os

+from PIL import ImageTk

 

 class MVColumnDescriptor(ColumnDescriptor):         

 

--- mgltools-pmv.orig/Pmv/pickingToolsCommands.py

+++ mgltools-pmv/Pmv/pickingToolsCommands.py

@@ -11,7 +11,8 @@

 # 

 # $Id: pickingToolsCommands.py,v 1.37 2012/04/25 18:34:07 sanner Exp $

 #

-import Pmw, ImageTk, Tkinter, os

+import Pmw, Tkinter, os

+from PIL import ImageTk

 

 from Pmv.mvCommand import MVCommand, MVCommandGUI, MVAtomICOM

 from Pmv.moleculeViewer import ICONPATH

--- mgltools-pmv.orig/Pmv/seqDisplay.py

+++ mgltools-pmv/Pmv/seqDisplay.py

@@ -22,9 +22,10 @@

 from MolKit.molecule import Atom, Molecule

 from MolKit.protein import Residue, ResidueSet, Chain

 

-import cairo, ImageTk, Image, Pmw

+import cairo, Pmw

 import math, time, sys

 import Tkinter

+from PIL import ImageTk, Image

 

 from mglutil.gui.BasicWidgets.Tk.colorWidgets import BackgroundColorChooser, ColorChooser

 from DejaVu.colorTool import TkColor, ToHSV, ToRGB

debian/patches/font.patch

+5 −9
Original line number Diff line number Diff line 
Description: Changing font parameter

Author: Thorsten Alteholz <debian@alteholz.de>

Last-Update: 2014-01-14

Index: pmv-prepatch/Pmv/moleculeViewer.py

===================================================================

--- pmv-prepatch.orig/Pmv/moleculeViewer.py	2013-02-01 20:34:48.000000000 +0100

+++ pmv-prepatch/Pmv/moleculeViewer.py	2014-01-14 15:27:27.000000000 +0100

@@ -1026,7 +1026,7 @@

--- mgltools-pmv.orig/Pmv/moleculeViewer.py

+++ mgltools-pmv/Pmv/moleculeViewer.py

@@ -1035,7 +1035,7 @@

                 self.GUI.toolsButtonBarMaster, width=10,

                 var=self.GUI.toolsButtonBarTabVar,

                 value='Dashbord', indicatoron=False,
@@ -14,10 +12,8 @@ Index: pmv-prepatch/Pmv/moleculeViewer.py 
             

             button.pack(side='left', anchor='w')

             def adjustWidth():

Index: pmv-prepatch/Pmv/pickingToolsCommands.py

===================================================================

--- pmv-prepatch.orig/Pmv/pickingToolsCommands.py	2012-04-25 20:34:07.000000000 +0200

+++ pmv-prepatch/Pmv/pickingToolsCommands.py	2014-01-14 15:26:59.000000000 +0100

--- mgltools-pmv.orig/Pmv/pickingToolsCommands.py

+++ mgltools-pmv/Pmv/pickingToolsCommands.py

@@ -62,7 +62,7 @@

                 self.vf.GUI.toolsButtonBarMaster, width=10,

                 var=self.vf.GUI.toolsButtonBarTabVar,

debian/patches/series

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ syntax_fixes.patch 


font.patch

indentiationStylesCommands.patch

fix_imports