[cmor] 160/190: Fix for unicode/str
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 8c91e6b34c5e366a55a7cebad09dd6f8337c2485
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Jun 16 17:21:22 2013 +0100
Fix for unicode/str
---
debian/patches/python3.patch | 271 ++++++++++++++++++++++++-------------------
1 file changed, 154 insertions(+), 117 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index ff54df1..90a9ce2 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,8 +5,8 @@ Forwarded: no
Index: cmor-2.8.3/Lib/git2svn.py
===================================================================
---- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Lib/git2svn.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Lib/git2svn.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import os,sys
@@ -33,8 +33,8 @@ Index: cmor-2.8.3/Lib/git2svn.py
os.popen(cmd).readlines()
Index: cmor-2.8.3/Lib/pywrapper.py
===================================================================
---- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Lib/pywrapper.py 2013-06-15 06:39:39.000000000 +0100
+--- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Lib/pywrapper.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
-
-import cmor_const,numpy,os,_cmor
@@ -709,8 +709,8 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if (file_name is False):
Index: cmor-2.8.3/Lib/__init__.py
===================================================================
---- cmor-2.8.3.orig/Lib/__init__.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py 2013-06-15 06:40:06.000000000 +0100
+--- cmor-2.8.3.orig/Lib/__init__.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Lib/__init__.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,9 +1,9 @@
-from cmor_const import *
-
@@ -729,8 +729,8 @@ Index: cmor-2.8.3/Lib/__init__.py
pass
Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
===================================================================
---- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cdms2
@@ -1153,8 +1153,8 @@ Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
Index: cmor-2.8.3/Test/check_results.py
===================================================================
---- cmor-2.8.3.orig/Test/check_results.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/check_results.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/check_results.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/check_results.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from out_files import out
@@ -1204,8 +1204,8 @@ Index: cmor-2.8.3/Test/check_results.py
+ raise CMORResultCheckError(["Error checking output files for test: Test/%s.f90 we could only find %i files when %i were expected.\n\n Expected files: \n\t%s\n\nPresent files: \n\t%s\n\nMissing files: \n\t%s\n" % (test,nfiles,len(outfiles),repr(outfiles),repr(gotfiles),repr(missing)),])
Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,11 +1,13 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1283,8 +1283,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
f.close()
Index: cmor-2.8.3/setup.py.in
===================================================================
---- cmor-2.8.3.orig/setup.py.in 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/setup.py.in 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/setup.py.in 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/setup.py.in 2013-06-15 10:54:40.000000000 +0100
@@ -1,8 +1,10 @@
+from __future__ import print_function # to be python2/python3 agnostic
import numpy
@@ -1317,8 +1317,8 @@ Index: cmor-2.8.3/setup.py.in
version='2.0',
Index: cmor-2.8.3/Test/cmor_speed_and_compression_02.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression_02.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_02.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_02.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_02.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,8 +1,9 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1391,8 +1391,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression_02.py
f.close()
Index: cmor-2.8.3/Test/cmor_speed_and_compression.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1454,8 +1454,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression.py
f.close()
Index: cmor-2.8.3/Test/jamie_hybrid_height.py
===================================================================
---- cmor-2.8.3.orig/Test/jamie_hybrid_height.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/jamie_hybrid_height.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/jamie_hybrid_height.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/jamie_hybrid_height.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1492,8 +1492,8 @@ Index: cmor-2.8.3/Test/jamie_hybrid_height.py
Index: cmor-2.8.3/Test/nc2asc.py
===================================================================
---- cmor-2.8.3.orig/Test/nc2asc.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/nc2asc.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/nc2asc.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/nc2asc.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1585,8 +1585,8 @@ Index: cmor-2.8.3/Test/nc2asc.py
f.close()
Index: cmor-2.8.3/Src/_cmormodule.c
===================================================================
---- cmor-2.8.3.orig/Src/_cmormodule.c 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Src/_cmormodule.c 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Src/_cmormodule.c 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Src/_cmormodule.c 2013-06-16 17:19:30.000000000 +0100
@@ -2,6 +2,26 @@
#include "numpy/arrayobject.h"
#include "cmor.h"
@@ -1595,7 +1595,7 @@ Index: cmor-2.8.3/Src/_cmormodule.c
+#if PY_MAJOR_VERSION >= 3
+#define PyInt_AsLong PyLong_AsLong
+#define PyInt_FromLong PyLong_FromLong
-+#define PyString_AsString PyBytes_AsString
++#define PyString_AsString PyUnicode_AsUTF8String
+#endif
+
+
@@ -1614,7 +1614,31 @@ Index: cmor-2.8.3/Src/_cmormodule.c
static PyObject *
PyCMOR_get_original_shape(PyObject *self,PyObject *args)
{
-@@ -799,11 +819,62 @@
+@@ -315,7 +335,11 @@
+ char *units;
+ char *interval;
+ int length;
++#if PY_MAJOR_VERSION >= 3
++ int type;
++#else
+ char type;
++#endif
+ void *coord_vals;
+ void *cell_bounds;
+ int cell_bounds_ndim;
+@@ -324,7 +348,11 @@
+ PyArrayObject *coords=NULL,*bounds=NULL;
+
+ /* HUGE assumtion here is that the data is contiguous! */
++#if PY_MAJOR_VERSION >=3
++ if (!PyArg_ParseTuple(args,"ssiOCOis",&name,&units,&length,&coords_obj,&type,&bounds_obj,&cell_bounds_ndim,&interval))
++#else
+ if (!PyArg_ParseTuple(args,"ssiOcOis",&name,&units,&length,&coords_obj,&type,&bounds_obj,&cell_bounds_ndim,&interval))
++#endif
+ return NULL;
+
+ if (coords_obj == Py_None) {
+@@ -799,11 +827,62 @@
{NULL, NULL} /*sentinel */
};
@@ -1682,8 +1706,8 @@ Index: cmor-2.8.3/Src/_cmormodule.c
/* int main(int argc,char **argv) */
Index: cmor-2.8.3/Test/test_compression.py
===================================================================
---- cmor-2.8.3.orig/Test/test_compression.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_compression.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_compression.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_compression.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,8 +1,9 @@
+from __future__ import print_function
import sys,os
@@ -1721,8 +1745,8 @@ Index: cmor-2.8.3/Test/test_compression.py
cmor.write(var_id2,s)
Index: cmor-2.8.3/Test/test_grid_stub_jamie.py
===================================================================
---- cmor-2.8.3.orig/Test/test_grid_stub_jamie.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_grid_stub_jamie.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_grid_stub_jamie.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_grid_stub_jamie.py 2013-06-15 10:54:40.000000000 +0100
@@ -71,7 +71,7 @@
try:
grid([[1], [2]])
@@ -1814,8 +1838,8 @@ Index: cmor-2.8.3/Test/test_grid_stub_jamie.py
Index: cmor-2.8.3/Test/test_python_2Gb_file.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_2Gb_file.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_2Gb_file.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_2Gb_file.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_2Gb_file.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1840,8 +1864,8 @@ Index: cmor-2.8.3/Test/test_python_2Gb_file.py
+print('hello')
Index: cmor-2.8.3/Test/test_python_2Gb_slice.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_2Gb_slice.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_2Gb_slice.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_2Gb_slice.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_2Gb_slice.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1875,8 +1899,8 @@ Index: cmor-2.8.3/Test/test_python_2Gb_slice.py
+print('hello')
Index: cmor-2.8.3/Test/test_python_3hr.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_3hr.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_3hr.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_3hr.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_3hr.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1893,8 +1917,8 @@ Index: cmor-2.8.3/Test/test_python_3hr.py
ilon = cmor.time_varying_grid_coordinate(igrid,table_entry='longitude',units='degrees_east')
Index: cmor-2.8.3/Test/test_python_appending.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_appending.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_appending.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_appending.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_appending.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1966,8 +1990,8 @@ Index: cmor-2.8.3/Test/test_python_appending.py
+print(f2)
Index: cmor-2.8.3/Test/test_python_bad_date.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_bad_date.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bad_date.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bad_date.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bad_date.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2006,8 +2030,8 @@ Index: cmor-2.8.3/Test/test_python_bad_date.py
Index: cmor-2.8.3/Test/test_python_bentley_01.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_bentley_01.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bentley_01.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bentley_01.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bentley_01.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2051,8 +2075,8 @@ Index: cmor-2.8.3/Test/test_python_bentley_01.py
if __name__ == '__main__':
Index: cmor-2.8.3/Test/test_python_bounds_request.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_bounds_request.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bounds_request.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bounds_request.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bounds_request.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2087,8 +2111,8 @@ Index: cmor-2.8.3/Test/test_python_bounds_request.py
iv = cmor.variable(table_entry='ta',axis_ids=numpy.array((itim,ilev,ilat,ilon)),units='K')
Index: cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_cfmip_site_axis_test.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_cfmip_site_axis_test.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py 2013-06-15 10:54:40.000000000 +0100
@@ -28,6 +28,7 @@
lev:formula_terms = "a: lev b: b orog: orog";
...
@@ -2149,8 +2173,8 @@ Index: cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_clim_bounds.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2168,8 +2192,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds.py
Index: cmor-2.8.3/Test/test_python_clim_bounds_02.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds_02.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_02.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_02.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_02.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2187,8 +2211,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds_02.py
Index: cmor-2.8.3/Test/test_python_clim_bounds_03.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds_03.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_03.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_03.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_03.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2215,8 +2239,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds_03.py
Index: cmor-2.8.3/Test/test_python_clim_bounds_04.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds_04.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_04.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_04.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_04.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2234,8 +2258,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds_04.py
Index: cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2252,8 +2276,8 @@ Index: cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py
path_test()
Index: cmor-2.8.3/Test/test_python_direct_calls.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_direct_calls.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_direct_calls.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_direct_calls.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_direct_calls.py 2013-06-16 17:20:26.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2329,8 +2353,8 @@ Index: cmor-2.8.3/Test/test_python_direct_calls.py
cmor._cmor.close(None,0,0)
Index: cmor-2.8.3/Test/test_python_fx.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_fx.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_fx.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_fx.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_fx.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2344,8 +2368,8 @@ Index: cmor-2.8.3/Test/test_python_fx.py
+print(test_mode(cmor.CMOR_REPLACE))
Index: cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_grid_and_ocn_sigma.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_grid_and_ocn_sigma.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2431,8 +2455,8 @@ Index: cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_index_coord.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_index_coord.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_index_coord.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_index_coord.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_index_coord.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2446,8 +2470,8 @@ Index: cmor-2.8.3/Test/test_python_index_coord.py
+print(f1)
Index: cmor-2.8.3/Test/test_python_jamie_10.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_10.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_10.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_10.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_10.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2465,8 +2489,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_10.py
Index: cmor-2.8.3/Test/test_python_jamie_12.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_12.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_12.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_12.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_12.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2485,8 +2509,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_12.py
def define_write_var(axis_ids, entry, unit, values):
Index: cmor-2.8.3/Test/test_python_jamie_2.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_2.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_2.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_2.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_2.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2514,8 +2538,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_2.py
if __name__ == '__main__':
Index: cmor-2.8.3/Test/test_python_jamie_6.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_6.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_6.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_6.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_6.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2532,8 +2556,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_6.py
units='1',
Index: cmor-2.8.3/Test/test_python_jamie_8.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_8.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_8.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_8.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_8.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2566,8 +2590,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_8.py
def cmor_ini():
Index: cmor-2.8.3/Test/test_python_jamie_9.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_9.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_9.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_9.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_9.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2585,8 +2609,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_9.py
Index: cmor-2.8.3/Test/test_python_jamie_site_surface.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_site_surface.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_site_surface.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_site_surface.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_site_surface.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2603,8 +2627,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_site_surface.py
Index: cmor-2.8.3/Test/test_python_joerg_10.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_10.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_10.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_10.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_10.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2649,8 +2673,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_10.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_11.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_11.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_11.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_11.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_11.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2695,8 +2719,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_11.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_12.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_12.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_12.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_12.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_12.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2741,8 +2765,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_12.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_2.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_2.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_2.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_2.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_2.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2778,8 +2802,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_2.py
else:
Index: cmor-2.8.3/Test/test_python_joerg_3.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_3.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_3.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_3.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_3.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2819,8 +2843,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_3.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_8.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_8.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_8.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_8.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_8.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2865,8 +2889,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_8.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_9.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_9.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_9.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_9.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_9.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,cdms2
@@ -2891,8 +2915,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_9.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_tim2_clim.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_tim2_clim.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_tim2_clim.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_tim2_clim.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_tim2_clim.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2916,8 +2940,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_tim2_clim.py
axis_ids,
Index: cmor-2.8.3/Test/test_python_max_variables_2.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_max_variables_2.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_max_variables_2.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_max_variables_2.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_max_variables_2.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2939,8 +2963,8 @@ Index: cmor-2.8.3/Test/test_python_max_variables_2.py
Index: cmor-2.8.3/Test/test_python_memory_check.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_memory_check.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_memory_check.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_memory_check.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_memory_check.py 2013-06-15 10:54:40.000000000 +0100
@@ -5,7 +5,7 @@
Memory stats are taken from http://code.activestate.com/recipes/286222/
@@ -2961,8 +2985,8 @@ Index: cmor-2.8.3/Test/test_python_memory_check.py
Index: cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_open_close_cmor_multiple.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_open_close_cmor_multiple.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2984,8 +3008,8 @@ Index: cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py
+print('hello')
Index: cmor-2.8.3/Test/test_python_reverted_lats.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_reverted_lats.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_reverted_lats.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_reverted_lats.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_reverted_lats.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -3002,8 +3026,8 @@ Index: cmor-2.8.3/Test/test_python_reverted_lats.py
cmor.write(ivar2,data,ntimes_passed=1,time_vals=[1.],time_bnds=[1.,2.])
Index: cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -3042,8 +3066,8 @@ Index: cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_singleton_string.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_singleton_string.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_singleton_string.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_singleton_string.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_singleton_string.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -3083,8 +3107,8 @@ Index: cmor-2.8.3/Test/test_python_singleton_string.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -3102,8 +3126,8 @@ Index: cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py
Index: cmor-2.8.3/Test/test_python_user_interface_00.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_user_interface_00.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_00.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_00.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_00.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -3181,8 +3205,8 @@ Index: cmor-2.8.3/Test/test_python_user_interface_00.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_user_interface_01.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_user_interface_01.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_01.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_01.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_01.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -3218,10 +3242,10 @@ Index: cmor-2.8.3/Test/test_python_user_interface_01.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_user_interface_03.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_user_interface_03.py 2013-06-15 06:38:50.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_03.py 2013-06-15 06:38:50.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_03.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_03.py 2013-06-15 10:56:19.000000000 +0100
@@ -1,11 +1,12 @@
-+from __future__ import print_functon
++from __future__ import print_function
import numpy
import cmor
@@ -3275,11 +3299,24 @@ Index: cmor-2.8.3/Test/test_python_user_interface_03.py
+print('Finito')
Index: cmor-2.8.3/Lib/cmor_const.py
===================================================================
---- cmor-2.8.3.orig/Lib/cmor_const.py 2013-06-14 16:13:00.000000000 +0100
-+++ cmor-2.8.3/Lib/cmor_const.py 2013-06-15 06:39:52.000000000 +0100
+--- cmor-2.8.3.orig/Lib/cmor_const.py 2013-06-15 10:54:40.000000000 +0100
++++ cmor-2.8.3/Lib/cmor_const.py 2013-06-15 10:54:40.000000000 +0100
@@ -1,4 +1,4 @@
-import _cmor
+from . import _cmor
atts = """
CMOR_MAX_STRING
CMOR_MAX_ELEMENTS
+Index: cmor-2.8.3/Test/test_python_common.py
+===================================================================
+--- cmor-2.8.3.orig/Test/test_python_common.py 2013-06-15 09:11:22.000000000 +0100
++++ cmor-2.8.3/Test/test_python_common.py 2013-06-15 11:01:29.000000000 +0100
+@@ -105,7 +105,7 @@
+ for k in range(n2):
+ for j in range(n1):
+ for i in range(n0):
+- field[k,j,i] = (k*64 + j*16 + i*4 + it)*factor - offset;
++ field[k,j,i] = (k*64 + j*16 + i*4 + it)*factor - offset;
+ return field
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list