[cmor] 157/190: Its PyInit__cmor not PyInit_cmor
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 4345ff98c86c9be8d2b42e63dc03c1bd29eda7d7
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Jun 14 16:13:00 2013 +0100
Its PyInit__cmor not PyInit_cmor
---
debian/patches/python3.patch | 226 +++++++++++++++++++++----------------------
1 file changed, 113 insertions(+), 113 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 451e2d5..e69bffb 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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Lib/git2svn.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Lib/git2svn.py 2013-06-14 16:11:48.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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Lib/pywrapper.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Lib/pywrapper.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,3 @@
-
import cmor_const,numpy,os,_cmor
@@ -708,8 +708,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Lib/__init__.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Lib/__init__.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,9 +1,9 @@
-from cmor_const import *
-
@@ -728,8 +728,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cdms2
@@ -1152,8 +1152,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Test/check_results.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Test/check_results.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/check_results.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from out_files import out
@@ -1203,8 +1203,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,11 +1,13 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1282,8 +1282,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/setup.py.in 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/setup.py.in 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/setup.py.in 2013-06-14 16:11:48.000000000 +0100
@@ -1,8 +1,10 @@
+from __future__ import print_function # to be python2/python3 agnostic
import numpy
@@ -1316,8 +1316,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_02.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_02.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_02.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,8 +1,9 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1390,8 +1390,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1453,8 +1453,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Test/jamie_hybrid_height.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Test/jamie_hybrid_height.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/jamie_hybrid_height.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1491,8 +1491,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Test/nc2asc.py 2013-06-13 17:25:44.000000000 +0100
+--- cmor-2.8.3.orig/Test/nc2asc.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/nc2asc.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1584,8 +1584,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-13 17:25:44.000000000 +0100
-+++ cmor-2.8.3/Src/_cmormodule.c 2013-06-14 15:40:21.000000000 +0100
+--- cmor-2.8.3.orig/Src/_cmormodule.c 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Src/_cmormodule.c 2013-06-14 16:12:05.000000000 +0100
@@ -2,6 +2,26 @@
#include "numpy/arrayobject.h"
#include "cmor.h"
@@ -1645,7 +1645,7 @@ Index: cmor-2.8.3/Src/_cmormodule.c
+
+#define INITERROR return NULL
+
-+PyObject * PyInit_cmor(void)
++PyObject * PyInit__cmor(void)
+
+#else
+#define INITERROR return
@@ -1681,8 +1681,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_compression.py 2013-06-13 17:48:58.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_compression.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_compression.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,8 +1,9 @@
+from __future__ import print_function
import sys,os
@@ -1720,8 +1720,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_grid_stub_jamie.py 2013-06-13 17:50:47.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_grid_stub_jamie.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_grid_stub_jamie.py 2013-06-14 16:11:48.000000000 +0100
@@ -71,7 +71,7 @@
try:
grid([[1], [2]])
@@ -1813,8 +1813,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_2Gb_file.py 2013-06-13 17:51:42.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_2Gb_file.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_2Gb_file.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1839,8 +1839,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_2Gb_slice.py 2013-06-13 17:52:28.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_2Gb_slice.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_2Gb_slice.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1874,8 +1874,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_3hr.py 2013-06-13 17:53:03.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_3hr.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_3hr.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1892,8 +1892,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_appending.py 2013-06-13 18:02:45.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_appending.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_appending.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1965,8 +1965,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bad_date.py 2013-06-13 18:03:43.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bad_date.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bad_date.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2005,8 +2005,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bentley_01.py 2013-06-13 18:05:35.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bentley_01.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bentley_01.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2050,8 +2050,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bounds_request.py 2013-06-13 18:06:24.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bounds_request.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bounds_request.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2086,8 +2086,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py 2013-06-13 18:09:55.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_cfmip_site_axis_test.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py 2013-06-14 16:11:48.000000000 +0100
@@ -28,6 +28,7 @@
lev:formula_terms = "a: lev b: b orog: orog";
...
@@ -2148,8 +2148,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds.py 2013-06-13 18:12:32.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2167,8 +2167,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_02.py 2013-06-13 18:10:40.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_02.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_02.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2186,8 +2186,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_03.py 2013-06-13 18:11:33.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_03.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_03.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2214,8 +2214,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_04.py 2013-06-13 18:12:00.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_04.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_04.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2233,8 +2233,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-13 19:49:42.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2251,8 +2251,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_direct_calls.py 2013-06-13 18:25:28.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_direct_calls.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_direct_calls.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2328,8 +2328,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_fx.py 2013-06-13 18:26:36.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_fx.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_fx.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2343,8 +2343,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py 2013-06-13 18:28:16.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_grid_and_ocn_sigma.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2430,8 +2430,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_index_coord.py 2013-06-13 18:28:55.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_index_coord.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_index_coord.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2445,8 +2445,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_10.py 2013-06-13 18:29:38.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_10.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_10.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2464,8 +2464,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_12.py 2013-06-13 18:30:07.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_12.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_12.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2484,8 +2484,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_2.py 2013-06-13 19:25:02.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_2.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_2.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2513,8 +2513,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_6.py 2013-06-13 19:25:53.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_6.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_6.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2531,8 +2531,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_8.py 2013-06-13 19:26:29.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_8.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_8.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2565,8 +2565,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_9.py 2013-06-13 19:26:54.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_9.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_9.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2584,8 +2584,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_site_surface.py 2013-06-13 19:27:23.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_site_surface.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_site_surface.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2602,8 +2602,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_10.py 2013-06-13 19:28:21.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_10.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_10.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2648,8 +2648,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_11.py 2013-06-13 19:29:05.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_11.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_11.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2694,8 +2694,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_12.py 2013-06-13 19:29:49.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_12.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_12.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2740,8 +2740,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_2.py 2013-06-13 19:36:45.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_2.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_2.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2777,8 +2777,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_3.py 2013-06-13 19:37:54.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_3.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_3.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2818,8 +2818,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_8.py 2013-06-13 19:38:58.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_8.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_8.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2864,8 +2864,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_9.py 2013-06-13 19:39:26.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_9.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_9.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,cdms2
@@ -2890,8 +2890,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_tim2_clim.py 2013-06-13 19:40:30.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_tim2_clim.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_tim2_clim.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2915,8 +2915,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_max_variables_2.py 2013-06-13 19:41:09.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_max_variables_2.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_max_variables_2.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2938,8 +2938,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_memory_check.py 2013-06-13 19:41:47.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_memory_check.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_memory_check.py 2013-06-14 16:11:48.000000000 +0100
@@ -5,7 +5,7 @@
Memory stats are taken from http://code.activestate.com/recipes/286222/
@@ -2960,8 +2960,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py 2013-06-13 19:42:31.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_open_close_cmor_multiple.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2983,8 +2983,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_reverted_lats.py 2013-06-13 19:43:13.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_reverted_lats.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_reverted_lats.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -3001,8 +3001,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-13 19:44:08.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -3041,8 +3041,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_singleton_string.py 2013-06-13 19:45:10.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_singleton_string.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_singleton_string.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -3082,8 +3082,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-13 19:45:40.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -3101,8 +3101,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_00.py 2013-06-13 19:46:54.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_00.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_00.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -3180,8 +3180,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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_01.py 2013-06-13 19:47:29.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_01.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_01.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -3217,8 +3217,8 @@ 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-13 17:09:53.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_03.py 2013-06-13 19:48:37.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_03.py 2013-06-14 16:11:48.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_03.py 2013-06-14 16:11:48.000000000 +0100
@@ -1,11 +1,12 @@
+from __future__ import print_functon
import numpy
--
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