[pyferret] 85/110: More python3 fixes

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit 5a6acbf82f20c2ada89439439c57f36e5c34c14a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 14 11:01:37 2016 +0100

    More python3 fixes
---
 debian/patches/python3.patch | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index f932c0d..862ea9e 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -2269,7 +2269,7 @@ Index: pyferret-7.0.0/pyfermod/graphbind/__init__.py
 ===================================================================
 --- pyferret-7.0.0.orig/pyfermod/graphbind/__init__.py
 +++ pyferret-7.0.0/pyfermod/graphbind/__init__.py
-@@ -1,16 +1,17 @@
+@@ -1,17 +1,18 @@
  '''
 +
  Maintains a dictionary of classes which can be used to bind PyFerret
@@ -2285,10 +2285,12 @@ Index: pyferret-7.0.0/pyfermod/graphbind/__init__.py
  graphics operations on this Window.
  '''
 -
+-from abstractpyferretbindings import AbstractPyFerretBindings
 +from __future__ import print_function
- from abstractpyferretbindings import AbstractPyFerretBindings
++from pyferret.graphbind.abstractpyferretbindings import AbstractPyFerretBindings
  
  __pyferret_bindings_classes = { }
+ 
 @@ -46,7 +47,7 @@ def knownPyFerretEngines():
      Returns a tuple of all the known engine names.
      '''
@@ -4467,16 +4469,32 @@ Index: pyferret-7.0.0/pyfermod/datamethods.py
 ===================================================================
 --- pyferret-7.0.0.orig/pyfermod/datamethods.py
 +++ pyferret-7.0.0/pyfermod/datamethods.py
-@@ -5,7 +5,11 @@ and Python.
+@@ -5,9 +5,13 @@ and Python.
  
  import numpy
  import numpy.ma
 -import StringIO
-+
+ 
+-import libpyferret
 +try:
 +    from StringIO import StringIO
 +except ImportError:
 +    from io import StringIO
++
++from pyferret import libpyferret
  
- import libpyferret
+ # set of units (in uppercase) for checking if a custom axis is actual a longitude axis
+ _UC_LONGITUDE_UNITS = frozenset( ("DEG E", "DEG_E", "DEG EAST", "DEG_EAST",
+Index: pyferret-7.0.0/pyfermod/pyefmethods.py
+===================================================================
+--- pyferret-7.0.0.orig/pyfermod/pyefmethods.py
++++ pyferret-7.0.0/pyfermod/pyefmethods.py
+@@ -3,7 +3,7 @@ Methods in pyferret to assist in the wri
+ written in Python.
+ """
+ 
+-import libpyferret
++from pyferret import libpyferret
  
+ def ferret_pyfunc():
+     """

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git