[ecflow] 50/50: Fix missing "from __future__ " clause in python3 patch. Closes: #874734

[Alastair McKinstry]

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

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

commit bcabc7c6d3fe3a5d9197f784c325d286e44dde61
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Sep 9 19:26:31 2017 +0100

    Fix missing "from __future__ " clause in python3 patch. Closes: #874734
---
 debian/changelog             |  3 ++-
 debian/patches/python3.patch | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90c5ed1..34c9f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-ecflow (4.6.1-2) UNRELEASED; urgency=medium
+ecflow (4.6.1-2) unstable; urgency=medium
 
   * Fix FTBFS with g++7. Closes: #873834
   * Standards-Version: 4.1.0; no changes required
+  * Fix missing "from __future__ " clause in python3 patch. Closes: #874734
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 09 Sep 2017 19:22:13 +0100
 
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 6c76b4e..d681e41 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,7 +1,7 @@
 Description: Fixes for both py2 and py3 simultaneously
 Author: Alastair McKinstry <mckinstry at debian.org>
 Forwarded: no
-Last-Updated: 2017-07-15
+Last-Updated: 2017-09-09
 
 Index: ecflow-4.6.1/Pyext/script.py
 ===================================================================
@@ -258,7 +258,14 @@ Index: ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
 ===================================================================
 --- ecflow-4.6.1.orig/Pyext/samples/api/sms2ecf.py
 +++ ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
-@@ -54,7 +54,7 @@ DICT_SMS_ECF = {
+@@ -1,5 +1,6 @@
+ #!/usr/bin/env python
+ """ one module to store needed function to translate SMS-ECFLOW suites """
++from __future__ import print_function
+ import sys
+ ECF_MODE = "ecflow" # "sms"
+ 
+@@ -54,7 +55,7 @@ DICT_SMS_ECF = {
      'SMSLOGTIMEOUT': 'ECF_LOGTIMEOUT',
  }
  
@@ -267,7 +274,7 @@ Index: ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
        
  def translate(name, value=None):
      """ find and replace submit, kill and status command, according to
-@@ -88,7 +88,7 @@ def translate(name, value=None):
+@@ -88,7 +89,7 @@ def translate(name, value=None):
                  else: rc = STATCMD + " %s" % rc
              return rc
  
@@ -276,7 +283,7 @@ Index: ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
          if name in ('SMSCMD', 'SMSKILL', 'SMSSTATUSCMD', 'SMSHOME'):
              value2 = value.replace('SMS', 'ECF_')
              value  = value2.replace(smssubmit, ecfsubmit)
-@@ -97,7 +97,7 @@ def translate(name, value=None):
+@@ -97,7 +98,7 @@ def translate(name, value=None):
              value  = value2.replace(smssubmit, ecfsubmit)
          transl = DICT_SMS_ECF[name]
  
@@ -285,7 +292,7 @@ Index: ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
          if name in  ('ECF_CMD_CMD', 'ECF_KILL_CMD', 'ECF_STATUS_CMD'):
              value2 = value.replace('ECF_', 'SMS')  
          transl = DICT_ECF_SMS[name]
-@@ -161,9 +161,9 @@ def sms2ecf(orig, dest):
+@@ -161,9 +162,9 @@ def sms2ecf(orig, dest):
                  for key in ignored:
                      if " %s " % key in line: 
                          continue                

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