From 3e41d9b79495ddc0daa6bf80fba6f32dd038ba1b Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sat, 16 Mar 2013 22:55:59 -0400 Subject: [PATCH] Made BreakpadSymbols script compatbile with Python 2.6 and above (bug 5660, r=asherkin). --- tools/buildbot/BreakpadSymbols | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/buildbot/BreakpadSymbols b/tools/buildbot/BreakpadSymbols index 7d40e8e4..b824bd21 100644 --- a/tools/buildbot/BreakpadSymbols +++ b/tools/buildbot/BreakpadSymbols @@ -1,6 +1,9 @@ # vim: set ts=2 sw=2 tw=99 noet ft=python: import os -import urllib.request +try: + import urllib.request as urllib +except ImportError: + import urllib2 as urllib from ambuild.command import Command from ambuild.command import ShellCommand @@ -26,9 +29,9 @@ class SymbolCommand(ShellCommand): def run(self, master, job): ShellCommand.run(self, master, job) if self.stdout != None and len(self.stdout) > 0: - request = urllib.request.Request(symbolServer, self.stdout.encode('utf-8')) + request = urllib.Request(symbolServer, self.stdout.encode('utf-8')) request.add_header("Content-Type", "text/plain") - self.serverResponse = urllib.request.urlopen(request).read().decode('utf-8') + self.serverResponse = urllib.urlopen(request).read().decode('utf-8') def spew(self, runner): if self.stderr != None and len(self.stderr) > 0: runner.PrintOut(self.stderr)