Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: sitescripts/extensions/utils.py

Issue 29370859: Issue 4767 - Improve error reporting in update_update_manifests (Closed)
Patch Set: For comment 16 Created Jan. 15, 2017, 7:32 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This file is part of the Adblock Plus web scripts, 1 # This file is part of the Adblock Plus web scripts,
2 # Copyright (C) 2006-2016 Eyeo GmbH 2 # Copyright (C) 2006-2016 Eyeo GmbH
3 # 3 #
4 # Adblock Plus is free software: you can redistribute it and/or modify 4 # Adblock Plus is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License version 3 as 5 # it under the terms of the GNU General Public License version 3 as
6 # published by the Free Software Foundation. 6 # published by the Free Software Foundation.
7 # 7 #
8 # Adblock Plus is distributed in the hope that it will be useful, 8 # Adblock Plus is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
15 15
16 import codecs 16 import codecs
17 import os 17 import os
18 import json 18 import json
19 import re 19 import re
20 import subprocess 20 import subprocess
21 import traceback 21 import traceback
22 import time 22 import time
23 import urlparse 23 import urlparse
24 import urllib 24 import urllib
25 import xml.dom.minidom as dom 25 import xml.dom.minidom as dom
26 from ConfigParser import SafeConfigParser, NoOptionError 26 from ConfigParser import SafeConfigParser, NoOptionError
27 from StringIO import StringIO 27 from StringIO import StringIO
28 from sitescripts.utils import get_config 28 from sitescripts.utils import get_config
29 from xml.parsers.expat import ExpatError
29 30
30 PACKAGE_SUFFIXES = { 31 PACKAGE_SUFFIXES = {
31 'gecko': '.xpi', 32 'gecko': '.xpi',
32 'gecko-webext': '.xpi', 33 'gecko-webext': '.xpi',
33 'chrome': '.crx', 34 'chrome': '.crx',
34 'safari': '.safariextz', 35 'safari': '.safariextz',
35 'ie': '.exe', 36 'ie': '.exe',
36 'android': '.apk' 37 'android': '.apk'
37 } 38 }
38 39
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 244
244 245
245 def _urlopen(url, attempts=3): 246 def _urlopen(url, attempts=3):
246 """ 247 """
247 Tries to open a particular URL, retries on failure. 248 Tries to open a particular URL, retries on failure.
248 """ 249 """
249 for i in range(attempts): 250 for i in range(attempts):
250 try: 251 try:
251 return urllib.urlopen(url) 252 return urllib.urlopen(url)
252 except IOError as e: 253 except IOError as e:
253 error = e 254 error = Exception('Error {0} while opening {1} url'
255 .format(e, url))
254 time.sleep(5) 256 time.sleep(5)
255 raise error 257 raise error
256 258
257 259
260 def _parseXMLDocument(url, attempts=2):
261 for i in range(attempts):
262 page = _urlopen(url)
263 content = page.read()
264 page.close()
Sebastian Noack 2017/01/17 09:33:32 The close() should have gone into a finally block,
Sebastian Noack 2017/01/17 10:16:56 Yes, in Python 2, the repsonse object returned by
Sebastian Noack 2017/01/17 10:20:15 Well, alternatively you could use try-finally. But
Vasily Kuznetsov 2017/01/17 10:30:34 Yeah, with is nicer, especially having Python 3 in
265 try:
266 return dom.parseString(content)
267 except ExpatError as err:
268 exception = Exception('Error {0} while parsing xml:\n{1}\nfrom {2}'
269 .format(err, content, url))
270 raise exception
271
272
258 def _getMozillaDownloadLink(galleryID): 273 def _getMozillaDownloadLink(galleryID):
259 """ 274 """
260 gets download link for a Gecko add-on from the Mozilla Addons site 275 gets download link for a Gecko add-on from the Mozilla Addons site
261 """ 276 """
262 url = 'https://services.addons.mozilla.org/en-US/firefox/api/1/addon/%s' % _ urlencode(galleryID) 277 url = 'https://services.addons.mozilla.org/en-US/firefox/api/1/addon/%s' % _ urlencode(galleryID)
263 document = dom.parse(_urlopen(url)) 278 document = _parseXMLDocument(url)
264 linkTags = document.getElementsByTagName('install') 279 linkTags = document.getElementsByTagName('install')
265 linkTag = linkTags[0] if len(linkTags) > 0 else None 280 linkTag = linkTags[0] if len(linkTags) > 0 else None
266 versionTags = document.getElementsByTagName('version') 281 versionTags = document.getElementsByTagName('version')
267 versionTag = versionTags[0] if len(versionTags) > 0 else None 282 versionTag = versionTags[0] if len(versionTags) > 0 else None
268 if linkTag and versionTag and linkTag.firstChild and versionTag.firstChild: 283 if linkTag and versionTag and linkTag.firstChild and versionTag.firstChild:
269 return (linkTag.firstChild.data, versionTag.firstChild.data) 284 return (linkTag.firstChild.data, versionTag.firstChild.data)
270 else: 285 else:
271 return (None, None) 286 return (None, None)
272 287
273 288
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 if not extensions: 394 if not extensions:
380 return 395 return
381 396
382 updates = {} 397 updates = {}
383 for extension in extensions: 398 for extension in extensions:
384 updates[extension['basename']] = { 399 updates[extension['basename']] = {
385 'url': extension['updateURL'], 400 'url': extension['updateURL'],
386 'version': extension['version'] 401 'version': extension['version']
387 } 402 }
388 writeLibabpUpdateManifest(path, updates) 403 writeLibabpUpdateManifest(path, updates)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld