环境检查

如果你的目标操作系统不是 python3 环境，可以忽略本节内容。仅限PY3适配

第三步：增加 patch4-SQOOP-PY3-SUP.diff 文件

在部分新版 Linux 发行版中，系统默认只提供 Python3，Sqoop 源码脚本需适配 Python3 语法，否则编译和 release notes 步骤会直接失败。Python3必修

提示

如上图，patch4-SQOOP-PY3-SUP.diff 主要针对 src/scripts/relnotes.py 做兼容性修正，包括 shebang 修改、print 语句升级、部分函数参数与异常处理的 Python3 写法改造。

主要修复点概览

• shebang 修改 由 #!/usr/bin/env/python 改为 #!/usr/bin/env python3
• print 语法升级 所有 print 由 Python2 写法统一替换为 Python3
• 异常捕获、编码、open 方式优化 避免 Python2 与 Python3 在文件 IO、异常提示方面的不兼容
• subprocess 替换 os.popen 命令行调用和输出捕获全部改用 subprocess，提升健壮性

兼容性修复

代码 diff 片段示例

-#!/usr/bin/env/python
+#!/usr/bin/env python3
...
-  print "Building release notes is not supported on this platform."
+  print("Building release notes is not supported on this platform.")
...
-  xml = os.popen("curl -s 'https://issues.apache.org/jira/si/jira.issueviews:" \
-      + "issue-xml/%s/%s.xml?field=key&field=type&field=parent'" % (issue, issue)).read()
-  return ElementTree.fromstring(xml)
+  xml = subprocess.check_output(
+      f"curl -s 'https://issues.apache.org/jira/si/jira.issueviews:issue-xml/{issue}/{issue}.xml?field=key&field=type&field=parent'",
+      shell=True, encoding="utf-8"
+  )
+  return ElementTree.fromstring(xml)
...
-  handle = open(os.path.join(target_dir, \
-      "sqoop-" + newversion + ".releasenotes.html"), "w")
-  handle.write(html)
-  handle.close()
+  with open(os.path.join(target_dir, "sqoop-" + newversion + ".releasenotes.html"), "w", encoding="utf-8") as handle:
+      handle.write(html)

---

完整的diff文件如下

diff --git a/src/scripts/relnotes.py b/src/scripts/relnotes.py
index cc540fa..4d6b5e4 100644
--- a/src/scripts/relnotes.py
+++ b/src/scripts/relnotes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env/python
+#!/usr/bin/env python3
 #
 # Copyright 2011 The Apache Software Foundation
 #
@@ -28,165 +28,151 @@
 import os
 import re
 import sys
+import subprocess
 
 try:
-  from xml.etree import ElementTree
+    from xml.etree import ElementTree
 except ImportError:
-  print "Building release notes is not supported on this platform."
-  sys.exit(0)
-
-
+    print("Building release notes is not supported on this platform.")
+    sys.exit(0)
 
 NUM_ARGS = 6
 
+
 def print_usage(prgm_name):
-  """ Print the usage for this program """
-  print "Usage: " + prgm_name + " <target-dir> <git-src> <commit-range> " \
-      + "<newversion> <oldversion>"
-  print ""
-  print "  <target-dir>: Directory where release notes should be written to."
-  print "  <git-src>: Root of the git repository to collect info from."
-  print "  <commit-range>: What set of commits form this release."
-  print "  <newversion>: The version number to print in the release notes."
-  print "  <oldversion>: The previous release version number."
+    """ Print the usage for this program """
+    print("Usage: " + prgm_name + " <target-dir> <git-src> <commit-range> "
+          + "<newversion> <oldversion>")
+    print("")
+    print("  <target-dir>: Directory where release notes should be written to.")
+    print("  <git-src>: Root of the git repository to collect info from.")
+    print("  <commit-range>: What set of commits form this release.")
+    print("  <newversion>: The version number to print in the release notes.")
+    print("  <oldversion>: The previous release version number.")
 
 
 def get_log(git_dir, commit_range):
-  """ Return the set of lines corresponding to the git log for the specified
-      commit range.
-  """
-
-  os.chdir(git_dir)
-  cmd = "git log --no-color '--pretty=format:%s' '" + commit_range + "'"
-  return os.popen(cmd).readlines()
+    os.chdir(git_dir)
+    cmd = f"git log --no-color '--pretty=format:%s' '{commit_range}'"
+    try:
+        return subprocess.check_output(cmd, shell=True, encoding="utf-8").splitlines()
+    except subprocess.CalledProcessError as e:
+        print(f"[WARN] git log failed: {e}. Release notes will be empty.", file=sys.stderr)
+        return []
 
 
 def sanitize_log(in_log):
-  """ 'sanitize' the log.
-      Some entries do not have a separate subject and body by accident.
-      Return a new log that only includes the first sentence of each
-      subject. (Note that we also usually have a 'SQOOP-nn.' before this
-      sentence.)
-  """
-  out_log = []
-  for line in in_log:
-    line = line.strip()
-    sentences = line.split(". ")
-    if len(sentences) <= 2:
-      out_log.append(line) # Unchanged original input.
-    else:
-      out_log.append(sentences[0] + ". " + sentences[1] + ".")
-
-  return out_log
+    """ 'sanitize' the log.
+        Some entries do not have a separate subject and body by accident.
+        Return a new log that only includes the first sentence of each
+        subject. (Note that we also usually have a 'SQOOP-nn.' before this
+        sentence.)
+    """
+    out_log = []
+    for line in in_log:
+        line = line.strip()
+        sentences = line.split(". ")
+        if len(sentences) <= 2:
+            out_log.append(line)  # Unchanged original input.
+        else:
+            out_log.append(sentences[0] + ". " + sentences[1] + ".")
+    return out_log
 
 
 def get_jira_doc(issue):
-  """ Get the XML document from JIRA for a specified issue. """
-
-  xml = os.popen("curl -s 'https://issues.apache.org/jira/si/jira.issueviews:" \
-      + "issue-xml/%s/%s.xml?field=key&field=type&field=parent'" % (issue, issue)).read()
-  return ElementTree.fromstring(xml)
+    """ Get the XML document from JIRA for a specified issue. """
+    xml = subprocess.check_output(
+        f"curl -s 'https://issues.apache.org/jira/si/jira.issueviews:issue-xml/{issue}/{issue}.xml?field=key&field=type&field=parent'",
+        shell=True, encoding="utf-8"
+    )
+    return ElementTree.fromstring(xml)
 
 
 def get_jira_issue_types(log):
-  """ Return a dict from issue-type -> ((issue-name, summary) list) by looking
-      up the issues in our JIRA.
-  """
-
-  d = {}
-
-  def add_issue(issue, typ, line):
-    try:
-      d[typ].append((issue, line))
-    except KeyError:
-      # This issue type hasn't been seen yet. Add a new list.
-      d[typ] = [ (issue, line) ]
-
-  jira_reg = r"^(SQOOP-\d+)"
-  for line in log:
-    matched_line = False
-    for m in re.finditer(jira_reg, line, re.M):
-      matched_line = True
-      jira = m.group(1)
-      doc = get_jira_doc(jira)
-      issue_type = doc.find('./channel/item/type').text
-      # Subtasks use the type of their parent item.
-      if issue_type == "Sub-task":
-        parent_doc = get_jira_doc(doc.find('./channel/item/parent').text)
-        issue_type = parent_doc.find('./channel/item/type').text
-
-      add_issue(jira, issue_type, line)
-    if not matched_line and not line.startswith("CLOUDERA-BUILD."):
-      # This line did not start with "SQOOP-.."
-      # Unless it's a CDH buildfix, add it in as a "Task". 
-      add_issue("", "Task", line)
-
-  return d
+    """ Return a dict from issue-type -> ((issue-name, summary) list) by looking
+        up the issues in our JIRA.
+    """
+    d = {}
+
+    def add_issue(issue, typ, line):
+        try:
+            d[typ].append((issue, line))
+        except KeyError:
+            # This issue type hasn't been seen yet. Add a new list.
+            d[typ] = [(issue, line)]
+
+    jira_reg = r"^(SQOOP-\d+)"
+    for line in log:
+        matched_line = False
+        for m in re.finditer(jira_reg, line, re.M):
+            matched_line = True
+            jira = m.group(1)
+            doc = get_jira_doc(jira)
+            issue_type = doc.find('./channel/item/type').text
+            # Subtasks use the type of their parent item.
+            if issue_type == "Sub-task":
+                parent_doc = get_jira_doc(doc.find('./channel/item/parent').text)
+                issue_type = parent_doc.find('./channel/item/type').text
+            add_issue(jira, issue_type, line)
+        if not matched_line and not line.startswith("CLOUDERA-BUILD."):
+            # This line did not start with "SQOOP-.."
+            # Unless it's a CDH buildfix, add it in as a "Task".
+            add_issue("", "Task", line)
+    return d
 
 
 def get_date():
-  """ Return the current month and year formatted as a string. """
-  return datetime.date.today().strftime("%B, %Y")
+    """ Return the current month and year formatted as a string. """
+    return datetime.date.today().strftime("%B, %Y")
 
 
 def add_links(summary_line):
-  """ Given a line like "SQOOP-40. Do something", add links to the JIRA
-      and any appropriate SIPs, and return the line with links.
-  """
-
-  initial_jira_reg = r"^(SQOOP-\d+)\. (.*)"
-
-  # Reformat the issue id away from the summary.
-  m = re.match(initial_jira_reg, summary_line)
-  if m == None:
-    # Line in unexpected format. Return as-is.
-    return summary_line
-  jira = m.group(1)
-  text = m.group(2)
-
-  # Add links to JIRA and SIP wiki.
-
-  issue_reg = r"(SQOOP-\d+)"
-  issue_subst = r'<a href="https://issues.cloudera.org/browse/\1">\1</a>'
-
-  sip_reg = r"(SIP-\d+)"
-  sip_subst = r'<a href="http://wiki.github.com/cloudera/sqoop/\1">\1</a>'
-
-  output = "[" + jira + "] - " + text
-  output = re.sub(issue_reg, issue_subst, output)
-  output = re.sub(sip_reg, sip_subst, output)
-
-  return output
+    """ Given a line like "SQOOP-40. Do something", add links to the JIRA
+        and any appropriate SIPs, and return the line with links.
+    """
+    initial_jira_reg = r"^(SQOOP-\d+)\. (.*)"
+    m = re.match(initial_jira_reg, summary_line)
+    if m == None:
+        # Line in unexpected format. Return as-is.
+        return summary_line
+    jira = m.group(1)
+    text = m.group(2)
+    issue_reg = r"(SQOOP-\d+)"
+    issue_subst = r'<a href="https://issues.cloudera.org/browse/\1">\1</a>'
+    sip_reg = r"(SIP-\d+)"
+    sip_subst = r'<a href="http://wiki.github.com/cloudera/sqoop/\1">\1</a>'
+    output = "[" + jira + "] - " + text
+    output = re.sub(issue_reg, issue_subst, output)
+    output = re.sub(sip_reg, sip_subst, output)
+    return output
 
 
 __user_types = {
-    "Bug" : "Bug fixes",
-    "Improvement" : "Improvements",
-    "New Feature" : "New features",
-    "Task" : "Tasks"
+    "Bug": "Bug fixes",
+    "Improvement": "Improvements",
+    "New Feature": "New features",
+    "Task": "Tasks"
 }
 
-def user_issue_type(typ):
-  """ Return a user-friendly issue type string based on the JIRA issue
-      type string.
-  """
-  global __user_types
-
-  try:
-    return __user_types[typ]
-  except KeyError:
-    # If we don't have a plural-form string set, just use the input.
-    return typ
 
+def user_issue_type(typ):
+    """ Return a user-friendly issue type string based on the JIRA issue
+        type string.
+    """
+    global __user_types
+    try:
+        return __user_types[typ]
+    except KeyError:
+        # If we don't have a plural-form string set, just use the input.
+        return typ
 
 
 def format_html(newversion, oldversion, log, jira_info):
-  """ Creates the HTML representation of the release notes and returns
-      it as a string.
-  """
-
-  output_lines = []
-  output_lines.append("""<html><head>
+    """ Creates the HTML representation of the release notes and returns
+        it as a string.
+    """
+    output_lines = []
+    output_lines.append("""<html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <title>Sqoop %(newversion)s Release Notes</title>
 <style type="Text/css">
@@ -198,56 +184,45 @@ def format_html(newversion, oldversion, log, jira_info):
 
 <p>This document lists all Sqoop issues included in version %(newversion)s
 not present in the previous release, %(oldversion)s.</p> 
-""" % { "newversion" : newversion,
-        "oldversion" : oldversion,
-        "date"       : get_date() })
-
-  
-  # Sort the output list by issue type.
-  types = jira_info.keys()
-  types.sort()
-  for typ in types:
-    output_lines.append("<h4>" + user_issue_type(typ) + ":</h4><ul>\n")
-    for (issue, summary) in jira_info[typ]:
-      output_lines.append("<li>")
-      output_lines.append(add_links(summary))
-      output_lines.append("</li>\n")
-    output_lines.append("</ul>\n")
-    
-  output_lines.append("</body></html>\n")
-  return "".join(output_lines)
+""" % {"newversion": newversion,
+       "oldversion": oldversion,
+       "date": get_date()})
+
+    types = sorted(jira_info.keys())
+    for typ in types:
+        output_lines.append("<h4>" + user_issue_type(typ) + ":</h4><ul>\n")
+        for (issue, summary) in jira_info[typ]:
+            output_lines.append("<li>")
+            output_lines.append(add_links(summary))
+            output_lines.append("</li>\n")
+        output_lines.append("</ul>\n")
+    output_lines.append("</body></html>\n")
+    return "".join(output_lines)
 
 
 def main(argv):
-  if len(argv) > 1 and argv[1] == '-h':
-    print_usage(argv[0])
+    if len(argv) > 1 and argv[1] == '-h':
+        print_usage(argv[0])
+        return 0
+    if len(argv) < NUM_ARGS:
+        print("Missing required argument(s). Try " + argv[0] + " -h")
+        return 1
+    target_dir = os.path.abspath(os.path.expanduser(argv[1]))
+    git_src = os.path.abspath(os.path.expanduser(argv[2]))
+    commit_range = argv[3]
+    newversion = argv[4]
+    oldversion = argv[5]
+    log = get_log(git_src, commit_range)
+    if not log:
+        print("[INFO] No commit logs found, possible git repo or commit issue, continue anyway.", file=sys.stderr)
+    log = sanitize_log(log)
+    jira_info = get_jira_issue_types(log)
+    html = format_html(newversion, oldversion, log, jira_info)
+    os.makedirs(target_dir, exist_ok=True)
+    with open(os.path.join(target_dir, "sqoop-" + newversion + ".releasenotes.html"), "w", encoding="utf-8") as handle:
+        handle.write(html)
     return 0
 
-  if len(argv) < NUM_ARGS:
-    print "Missing required argument(s). Try " + argv[0] + " -h"
-    return 1
-
-  target_dir = os.path.abspath(os.path.expanduser(argv[1]))
-  git_src = os.path.abspath(os.path.expanduser(argv[2]))
-  commit_range = argv[3]
-  newversion = argv[4]
-  oldversion = argv[5]
-
-  log = get_log(git_src, commit_range)
-  log = sanitize_log(log)
-  jira_info = get_jira_issue_types(log)   
-  html = format_html(newversion, oldversion, log, jira_info)
-
-  os.system("mkdir -p \"" + target_dir + "\"")
-  handle = open(os.path.join(target_dir, \
-      "sqoop-" + newversion + ".releasenotes.html"), "w")
-  handle.write(html)
-  handle.close()
-
-  return 0
-
 
 if __name__ == "__main__":
-  sys.exit(main(sys.argv))
-
-
+    sys.exit(main(sys.argv))