[eccodes] 96/106: some updates for py3

[Alastair McKinstry]

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

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

commit f2426eae114633d2ee804b62c2006487ce6327a4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 3 11:57:44 2017 +0100

    some updates for py3
---
 debian/patches/py3-fixes.patch | 64 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 6 deletions(-)

diff --git a/debian/patches/py3-fixes.patch b/debian/patches/py3-fixes.patch
index 0155dd6..59f1b44 100644
--- a/debian/patches/py3-fixes.patch
+++ b/debian/patches/py3-fixes.patch
@@ -1,7 +1,7 @@
-Index: eccodes-2.3.0/python/CMakeLists.txt
+Index: eccodes-2.4.0/python/CMakeLists.txt
 ===================================================================
---- eccodes-2.3.0.orig/python/CMakeLists.txt
-+++ eccodes-2.3.0/python/CMakeLists.txt
+--- eccodes-2.4.0.orig/python/CMakeLists.txt
++++ eccodes-2.4.0/python/CMakeLists.txt
 @@ -1,9 +1,9 @@
  if( HAVE_PYTHON )
  
@@ -16,10 +16,10 @@ Index: eccodes-2.3.0/python/CMakeLists.txt
  
      # preparing for generating setup.py
      if( HAVE_LIBJASPER )
-Index: eccodes-2.3.0/python/gribapi_swig.i
+Index: eccodes-2.4.0/python/gribapi_swig.i
 ===================================================================
---- eccodes-2.3.0.orig/python/gribapi_swig.i
-+++ eccodes-2.3.0/python/gribapi_swig.i
+--- eccodes-2.4.0.orig/python/gribapi_swig.i
++++ eccodes-2.4.0/python/gribapi_swig.i
 @@ -17,14 +17,17 @@
  import_array();
  %}
@@ -64,3 +64,55 @@ Index: eccodes-2.3.0/python/gribapi_swig.i
  int grib_c_multi_support_off(void);
  int grib_c_multi_release(int* gid);
  int grib_c_multi_append(int* INPUT, int* INPUT,int* INPUT);
+Index: eccodes-2.4.0/python/eccodes/high_level/codesfile.py
+===================================================================
+--- eccodes-2.4.0.orig/python/eccodes/high_level/codesfile.py
++++ eccodes-2.4.0/python/eccodes/high_level/codesfile.py
+@@ -6,9 +6,9 @@ Author: Daniel Lee, DWD, 2016
+ """
+ 
+ from .. import eccodes
++from io import IOBase
+ 
+-
+-class CodesFile(file):
++class CodesFile(IOBase):
+ 
+     """
+     An abstract class to specify and/or implement common behaviour that files
+Index: eccodes-2.4.0/python/gribapi/gribapi.py
+===================================================================
+--- eccodes-2.4.0.orig/python/gribapi/gribapi.py
++++ eccodes-2.4.0/python/gribapi/gribapi.py
+@@ -22,15 +22,15 @@ When this is enabed, then the system Pyt
+     - NumPy
+ 
+ """
+-import gribapi_swig as _internal
+-from gribapi import gribapi_swig as _internal
++# import gribapi_swig as _internal
++from . import gribapi_swig as _internal
+ import types
+ import sys
+ import os
+ from functools import wraps
+ # import inspect
+ from . import errors
+-from errors import *  # noqa
++from .errors import *  # noqa
+ 
+ try:
+     type(file)
+Index: eccodes-2.4.0/python/gribapi/errors.py
+===================================================================
+--- eccodes-2.4.0.orig/python/gribapi/errors.py
++++ eccodes-2.4.0/python/gribapi/errors.py
+@@ -2,7 +2,7 @@
+ Exception class hierarchy
+ """
+ 
+-import gribapi_swig as _internal
++from . import gribapi_swig as _internal
+ 
+ 
+ class GribInternalError(Exception):

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