svn commit: r304409 - head/Tools/scripts

[Sofian Brabez]

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():