Make sure subprocess calls don`t ignore result codes indicating errors. Fix JS docs generation whil…

sitescripts/subscriptions/subscriptionParser.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 207 matching lines @@
   for fileData in lists.itervalues():
     for supplements in fileData.supplements:
       if supplements in lists:
         lists[supplements].supplemented.append(fileData)
       else:
         warn('Subscription %s supplements an unknown subscription %s' % (fileData.name, supplements))
 
 @cached(60)
 def get_settings():
   repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
-  (settingsData, errors) = subprocess.Popen(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'settings')], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-  if errors:
-    print >>sys.stderr, errors
-
+  settingsData = subprocess.check_output(['hg', '-q', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'settings')])

[Sebastian Noack, 2013/07/04 13:57:51]

The added -q parameter doesn't seem to have any affect, because of neither the
ouput of the content of the given file, nor error messages are affected by hg's
-q parameter.

   settings = SafeConfigParser()
   settings.readfp(codecs.getreader('utf8')(StringIO(settingsData)))
   return settings
 
 def readSubscriptions():
   repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
-  (data, errors) = subprocess.Popen(['hg', 'archive', '-R', repo, '-r', 'default', '-t', 'tar', '-I', os.path.join(repo, '*.subscription'), '-'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-  if errors:
-    print >>sys.stderr, errors
+  data = subprocess.check_output(['hg', 'archive', '-q', '-R', repo, '-r', 'default', '-t', 'tar', '-I', os.path.join(repo, '*.subscription'), '-'])
 
   result =  {}
   tarFile = tarfile.open(mode='r:', fileobj=StringIO(data))
   fileInfo = tarFile.next()
   while fileInfo:
     fileData = parseFile(fileInfo.name, codecs.getreader('utf8')(tarFile.extractfile(fileInfo)))
     fileInfo = tarFile.next()
     if fileData.unavailable:
       continue
 
     if fileData.name in result:
       warn('Name %s is claimed by multiple files' % (fileData.name))
     result[fileData.name] = fileData
   tarFile.close()
 
   calculateSupplemented(result)
   return result
 
 def getFallbackData():
   repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
-  (redirectData, errors) = subprocess.Popen(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'redirects')], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-  if errors:
-    print >>sys.stderr, errors
-
-  (goneData, errors) = subprocess.Popen(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'gone')], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-  if errors:
-    print >>sys.stderr, errors
-
+  redirectData = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'redirects')])
+  goneData = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'gone')])
   return (redirectData, goneData)
 
 def _validateURL(url):
   parseResult = urlparse(url)
   return (parseResult.scheme == 'http' or parseResult.scheme == 'https') and parseResult.netloc != ''