Commit 0e816f59 authored by Fazlul Shahriar's avatar Fazlul Shahriar Committed by Russ Cox

codereview: fix 'hg sync' and 'hg download' in Python 2.7

Fixes #1218.

R=rsc
CC=golang-dev
https://golang.org/cl/2664041
parent 270bad39
...@@ -1508,7 +1508,7 @@ def IsRietveldSubmitted(ui, clname, hex): ...@@ -1508,7 +1508,7 @@ def IsRietveldSubmitted(ui, clname, hex):
if feed is None: if feed is None:
return False return False
for sum in feed.findall("{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}summary"): for sum in feed.findall("{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}summary"):
text = sum.findtext("", None).strip() text = sum.text.strip()
m = re.match('\*\*\* Submitted as [^*]*?([0-9a-f]+) \*\*\*', text) m = re.match('\*\*\* Submitted as [^*]*?([0-9a-f]+) \*\*\*', text)
if m is not None and len(m.group(1)) >= 8 and hex.startswith(m.group(1)): if m is not None and len(m.group(1)) >= 8 and hex.startswith(m.group(1)):
return True return True
...@@ -1542,7 +1542,7 @@ def DownloadCL(ui, repo, clname): ...@@ -1542,7 +1542,7 @@ def DownloadCL(ui, repo, clname):
# Find author - first entry will be author who created CL. # Find author - first entry will be author who created CL.
nick = None nick = None
for author in feed.findall("{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}author/{http://www.w3.org/2005/Atom}name"): for author in feed.findall("{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}author/{http://www.w3.org/2005/Atom}name"):
nick = author.findtext("", None).strip() nick = author.text.strip()
break break
if not nick: if not nick:
return None, None, "CL has no author" return None, None, "CL has no author"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment