[cmor] 07/08: Update python3 patch

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/3.2.6-1
in repository cmor.

commit 9f53fe97efcba8e5eeb396f8b2d7e0e4f5ad0366
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 11 09:10:19 2017 +0100

    Update python3 patch
---
 debian/patches/python3.patch | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index fa2c0a3..c89bd04 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Fixes needed to make code python2/3 compatible. NOTE: INCOMPLETE
-Last-Updated: 2017-07-29
+Last-Updated: 2017-09-10
 Forwarded: no
 
 Index: cmor-3.2.6/Lib/pywrapper.py
@@ -2738,6 +2738,23 @@ Index: cmor-3.2.6/LibCV/PrePARE/PrePARE.py
                  if(self.dictGbl["sub_experiment_id"] not in ["none"]):
                      member_id = self.dictGbl["sub_experiment_id"] + \
                          '-' + self.dictGbl["variant_label"]
+@@ -278,11 +279,11 @@ class checkCMIP6(object):
+         varid = cmip6_cv.setup_variable(self.var[0], varunits, varmissing, startime, endtime,
+                                         startimebnds, endtimebnds)
+         if(varid == -1):
+-            print bcolors.FAIL
+-            print "====================================================================================="
+-            print " Could not find variable '%s' in table '%s' " % (self.var[0], self.cmip6_table)
+-            print "====================================================================================="
+-            print bcolors.ENDC
++            print (bcolors.FAIL)
++            print ("=====================================================================================")
++            print (" Could not find variable '%s' in table '%s' " % (self.var[0], self.cmip6_table))
++            print ("=====================================================================================")
++            print (bcolors.ENDC)
+             cmip6_cv.set_CV_Error()
+             return
+  
 @@ -295,32 +296,32 @@ class checkCMIP6(object):
              fn)
  

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