aboutsummaryrefslogtreecommitdiff
path: root/Tools/scripts/getpatch
diff options
context:
space:
mode:
authorSofian Brabez <sbz@FreeBSD.org>2012-09-17 16:34:54 +0000
committerSofian Brabez <sbz@FreeBSD.org>2012-09-17 16:34:54 +0000
commit585bd71a3558aff0d4e81829cb8cbe2a7841f5b6 (patch)
tree77af5eab933c7ba1df1e60653c8bf193dd54158a /Tools/scripts/getpatch
parentc999b0fc14640e91e59e177158c60b8b6753d6a3 (diff)
downloadports-585bd71a3558aff0d4e81829cb8cbe2a7841f5b6.tar.gz
ports-585bd71a3558aff0d4e81829cb8cbe2a7841f5b6.zip
- Fix bytes problem returned by urlopen when using Python 3.x
Notes
Notes: svn path=/head/; revision=304409
Diffstat (limited to 'Tools/scripts/getpatch')
-rwxr-xr-xTools/scripts/getpatch8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/scripts/getpatch b/Tools/scripts/getpatch
index d8729ec93d3a..9c278ccd0086 100755
--- a/Tools/scripts/getpatch
+++ b/Tools/scripts/getpatch
@@ -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():