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

Fixes #1218.

R=rsc
CC=golang-dev
https://golang.org/cl/2664041

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index 73c47d9993bcc9062236c109e4c11a67acefe8b0..0095a6d59acabeb223d9554300938bc06c18ba3d 100644 (file)
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -1508,7 +1508,7 @@ def IsRietveldSubmitted(ui, clname, hex):
        if feed is None:
                return False
        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)
                if m is not None and len(m.group(1)) >= 8 and hex.startswith(m.group(1)):
                        return True
@@ -1542,7 +1542,7 @@ def DownloadCL(ui, repo, clname):
        # Find author - first entry will be author who created CL.
        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"):
-               nick = author.findtext("", None).strip()
+               nick = author.text.strip()
                break
        if not nick:
                return None, None, "CL has no author"