[cmor] 145/190: WIP: iterate.

[Alastair McKinstry]

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

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

commit 59fa34bf6be487766a4b1984ce504de9c798a883
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 12 12:22:15 2013 +0100

    WIP: iterate.
---
 debian/patches/python3.patch | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 0760d5a..e0e3976 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-12 12:01:48.000000000 +0100
-+++ cmor-2.8.3/Lib/git2svn.py	2013-06-12 12:01:48.000000000 +0100
+--- cmor-2.8.3.orig/Lib/git2svn.py	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/Lib/git2svn.py	2013-06-12 12:04:21.000000000 +0100
 @@ -1,5 +1,7 @@
  import os,sys
  
@@ -36,8 +36,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-12 12:01:48.000000000 +0100
-+++ cmor-2.8.3/Lib/pywrapper.py	2013-06-12 12:01:48.000000000 +0100
+--- cmor-2.8.3.orig/Lib/pywrapper.py	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/Lib/pywrapper.py	2013-06-12 12:04:21.000000000 +0100
 @@ -37,25 +37,25 @@
      missing_value : scalar that is used to indicate missing data for this variable.  It must be the same type as the data that will be passed to cmor_write.  This missing_value will in general be replaced by a standard missing_value specified in the MIP table.  If there are no missing data, and the user chooses not to declare the missing value, then this argument may be either omitted or assigned the value 'none' (i.e., missing_value='none').
      """
@@ -692,12 +692,12 @@ 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-12 12:01:48.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py	2013-06-12 12:01:48.000000000 +0100
+--- cmor-2.8.3.orig/Lib/__init__.py	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/Lib/__init__.py	2013-06-12 12:21:48.000000000 +0100
 @@ -1,9 +1,11 @@
++from __future__ import print_function
  from cmor_const import *
  
-+from __future__ import print_function
 +
  from pywrapper import axis,variable,write,setup,load_table,dataset,set_table,zfactor,close,grid,set_grid_mapping,time_varying_grid_coordinate,set_cur_dataset_attribute,get_cur_dataset_attribute,has_cur_dataset_attribute,create_output_path,set_variable_attribute,get_variable_attribute,has_variable_attribute
  
@@ -709,13 +709,17 @@ 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-12 12:01:48.000000000 +0100
-+++ cmor-2.8.3/Lib/check_CMOR_compliant.py	2013-06-12 12:01:48.000000000 +0100
-@@ -8,6 +8,8 @@
+--- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/Lib/check_CMOR_compliant.py	2013-06-12 12:21:36.000000000 +0100
+@@ -1,3 +1,4 @@
++from __future__ import print_function
+ import cdms2
+ import os
+ import unidata
+@@ -8,6 +9,7 @@
  import time
  VERBOSE=-999
  
-+from __future__ import print_function
 +
  #ok now we are going online to pull the file that has the control md5s
  try:
@@ -902,8 +906,8 @@ Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
                                  mid=cdtime.reltime(ax[ib],ax.units).tocomp(c)
 Index: cmor-2.8.3/Test/check_results.py
 ===================================================================
---- cmor-2.8.3.orig/Test/check_results.py	2013-06-12 12:01:48.000000000 +0100
-+++ cmor-2.8.3/Test/check_results.py	2013-06-12 12:01:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/check_results.py	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/Test/check_results.py	2013-06-12 12:04:21.000000000 +0100
 @@ -2,6 +2,8 @@
  from in_files import input_tables
  import sys,os
@@ -957,8 +961,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-12 12:01:48.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py	2013-06-12 12:01:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py	2013-06-12 12:04:21.000000000 +0100
 @@ -1,11 +1,13 @@
  import cmor,numpy,sys,os
 +
@@ -1036,13 +1040,15 @@ 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-12 11:39:41.000000000 +0100
-+++ cmor-2.8.3/setup.py.in	2013-06-12 12:03:41.000000000 +0100
-@@ -3,6 +3,8 @@
+--- cmor-2.8.3.orig/setup.py.in	2013-06-12 12:04:17.000000000 +0100
++++ cmor-2.8.3/setup.py.in	2013-06-12 12:20:22.000000000 +0100
+@@ -1,8 +1,10 @@
++from __future__ import print_function # to be python2/python3 agnostic
+ import numpy
+ from numpy.distutils.core import setup, Extension
  #from numpy.distutils.ccompiler import CCompiler
  import os,sys,string
  
-+from __future__ import print_function # to be python2/python3 agnostic
 +
  include_dirs = [numpy.lib.utils.get_include(),"include","include/cdTime"]
  

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