[pyferret] 72/110: update python3.patch, minor fixes

[Alastair McKinstry]

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

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

commit 086b455c81bf5123034b8b06f5534b261de59fc4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Aug 13 22:43:53 2016 +0100

    update python3.patch, minor fixes
---
 debian/patches/python3.patch | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 56f6b33..1857d70 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Support Python3
-Last-Updated: 2015-10-30
+Last-Updated: 2016-08-15
 Forwarded: no
 
 Index: pyferret-7.0.0/ferretmagic.py
@@ -743,7 +743,7 @@ Index: pyferret-7.0.0/pyfermod/eofanal/eofanalysis.py
 -        print 'TAF %d has norm^2: %#.4f' % (k, sqnorm)
 -        print formatter.pformat(tafvec)
 +        print ('TAF %d has norm^2: %#.4f' % (k, sqnorm))
-+        print (formatter.pformat(tafvec)))
++        print (formatter.pformat(tafvec))
          tafeof = numpy.outer(tafvec, eofvec) 
          contrib = eofanal.datapiece(k)
          if numpy.allclose(contrib, tafeof):
@@ -1267,9 +1267,24 @@ Index: pyferret-7.0.0/pyfermod/regrid/regrid2dtests.py
          if mismatch_found:
              self.fail("data mismatch found")
  
-@@ -394,7 +397,7 @@ class CurvRectRegridderTests(unittest.Te
+@@ -392,9 +395,9 @@ class CurvRectRegridderTests(unittest.Te
+             for j in xrange(2, expect_data.shape[1] - 1):
+                 if numpy.abs(expect_data[i, j] - regrid_data[i, j]) > 0.0003:
                      mismatch_found = True
-                     print "expect = %#6.4f, found = %#6.4f for lon = %7.3f, " \
+-                    print "expect = %#6.4f, found = %#6.4f for lon = %7.3f, " \
++                    print ("expect = %#6.4f, found = %#6.4f for lon = %7.3f, " \
+                           "lat = %7.3f" % (expect_data[i, j], regrid_data[i, j],
+-                          self.curv_center_lons[i][j], self.curv_center_lats[i][j])
++                          self.curv_center_lons[i][j], self.curv_center_lats[i][j])))
+         if mismatch_found:
+             self.fail("data mismatch found")
+ 
+@@ -429,9 +432,9 @@ class CurvRectRegridderTests(unittest.Te
+             for j in xrange(2, expect_data.shape[1] - 1):
+                 if numpy.abs(expect_data[i, j] - regrid_data[i, j]) > 0.0011:
+                     mismatch_found = True
+-                    print "expect = %#6.4f, found = %#6.4f for lon = %7.3f, " \
++                    print ("expect = %#6.4f, found = %#6.4f for lon = %7.3f, " \
                            "lat = %7.3f" % (expect_data[i, j], regrid_data[i, j],
 -                          self.curv_center_lons[i][j], self.curv_center_lats[i][j])
 +                          self.curv_center_lons[i][j], self.curv_center_lats[i][j]))

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