From owner-svn-ports-all@FreeBSD.ORG Mon Sep 17 16:34:55 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59821106564A; Mon, 17 Sep 2012 16:34:55 +0000 (UTC) (envelope-from sbz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 446458FC1A; Mon, 17 Sep 2012 16:34:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8HGYt3p052810; Mon, 17 Sep 2012 16:34:55 GMT (envelope-from sbz@svn.freebsd.org) Received: (from sbz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8HGYtoS052808; Mon, 17 Sep 2012 16:34:55 GMT (envelope-from sbz@svn.freebsd.org) Message-Id: <201209171634.q8HGYtoS052808@svn.freebsd.org> From: Sofian Brabez Date: Mon, 17 Sep 2012 16:34:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304409 - head/Tools/scripts X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Sep 2012 16:34:55 -0000 Author: sbz Date: Mon Sep 17 16:34:54 2012 New Revision: 304409 URL: http://svn.freebsd.org/changeset/ports/304409 Log: - Fix bytes problem returned by urlopen when using Python 3.x Modified: head/Tools/scripts/getpatch Modified: head/Tools/scripts/getpatch ============================================================================== --- head/Tools/scripts/getpatch Mon Sep 17 15:18:33 2012 (r304408) +++ head/Tools/scripts/getpatch Mon Sep 17 16:34:54 2012 (r304409) @@ -57,7 +57,7 @@ class GetPatch(object): if filename.endswith(('.patch', '.txt')): filename = filename[:filename.rindex('.')]+'.diff' f=open(filename, 'w') - f.write(data) + f.write(data.decode()) f.close() self.out("[+] %s created" % filename) @@ -79,7 +79,7 @@ class GetPatch(object): data = urllib2.urlopen(url).read() if self.output_stdout: - sys.stdout.write(data) + sys.stdout.write(data.decode()) else: self.write(p, data) @@ -107,7 +107,7 @@ class GnatsGetPatch(GetPatch): self.out("[-] No patch found") sys.exit(1) - for patchs in re.findall(pattern, data): + for patchs in re.findall(pattern, str(data)): self.patchs.append({'url': patchs[0], 'name': patchs[1]}) class BzGetPatch(GetPatch): @@ -155,7 +155,7 @@ class BzGetPatch(GetPatch): self.out("[-] No patch found") sys.exit(1) - for i in xrange(nb_urls): + for i in range(nb_urls): self.patchs.append({'url': urls[i], 'name': names[i]}) def main():