arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-339: [Dev] Lingering Python 3 fixes
Date Tue, 01 Nov 2016 01:16:38 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 772bc6ea6 -> ca088dd19


ARROW-339: [Dev] Lingering Python 3 fixes

I missed a couple Python 3 things. I'll leave this open until one of us successfully merged
another patch with this before we merge it.

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #191 from wesm/ARROW-339-2 and squashes the following commits:

78bf094 [Wes McKinney] Lingering Python 3 fixes


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/ca088dd1
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/ca088dd1
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/ca088dd1

Branch: refs/heads/master
Commit: ca088dd19eb4283c71252de39782d811f985649a
Parents: 772bc6e
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Mon Oct 31 21:16:29 2016 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Mon Oct 31 21:16:29 2016 -0400

----------------------------------------------------------------------
 dev/merge_arrow_pr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/ca088dd1/dev/merge_arrow_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index aa899ed..f7e7a37 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -210,7 +210,7 @@ def fix_version_from_branch(branch, versions):
 
 def exctract_jira_id(title):
     m = re.search(r'^(ARROW-[0-9]+)\b.*$', title)
-    if m and m.groups > 0:
+    if m:
         return m.group(1)
     else:
         fail("PR title should be prefixed by a jira id "
@@ -256,8 +256,8 @@ def resolve_jira(title, merge_branches, comment):
     print("summary\t\t%s\nassignee\t%s\nstatus\t\t%s\nurl\t\t%s/%sf\n"
           % (cur_summary, cur_assignee, cur_status, JIRA_BASE, jira_id))
 
-    resolve = filter(lambda a: a['name'] == "Resolve Issue",
-                     asf_jira.transitions(jira_id))[0]
+    resolve = [x for x in asf_jira.transitions(jira_id)
+               if x['name'] == "Resolve Issue"][0]
     asf_jira.transition_issue(jira_id, resolve["id"], comment=comment)
 
     print("Succesfully resolved %s!" % (jira_id))


Mime
View raw message