| OLD | NEW | 
|    1 # coding: utf-8 |    1 # coding: utf-8 | 
|    2  |    2  | 
|    3 # This file is part of the Adblock Plus web scripts, |    3 # This file is part of the Adblock Plus web scripts, | 
|    4 # Copyright (C) 2006-2014 Eyeo GmbH |    4 # Copyright (C) 2006-2014 Eyeo GmbH | 
|    5 # |    5 # | 
|    6 # Adblock Plus is free software: you can redistribute it and/or modify |    6 # Adblock Plus is free software: you can redistribute it and/or modify | 
|    7 # it under the terms of the GNU General Public License version 3 as |    7 # it under the terms of the GNU General Public License version 3 as | 
|    8 # published by the Free Software Foundation. |    8 # published by the Free Software Foundation. | 
|    9 # |    9 # | 
|   10 # Adblock Plus is distributed in the hope that it will be useful, |   10 # Adblock Plus is distributed in the hope that it will be useful, | 
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  129   downloadsURL = _defineGlobalProperty('downloadsURL') |  129   downloadsURL = _defineGlobalProperty('downloadsURL') | 
|  130   docsDirectory = _defineGlobalProperty('docsDirectory') |  130   docsDirectory = _defineGlobalProperty('docsDirectory') | 
|  131   signtool = _defineGlobalProperty('signtool') |  131   signtool = _defineGlobalProperty('signtool') | 
|  132   certname = _defineGlobalProperty('signtool_certname') |  132   certname = _defineGlobalProperty('signtool_certname') | 
|  133   dbdir = _defineGlobalProperty('signtool_dbdir') |  133   dbdir = _defineGlobalProperty('signtool_dbdir') | 
|  134   dbpass = _defineGlobalProperty('signtool_dbpass') |  134   dbpass = _defineGlobalProperty('signtool_dbpass') | 
|  135  |  135  | 
|  136   keyFile = _defineLocalProperty('key', '') |  136   keyFile = _defineLocalProperty('key', '') | 
|  137   name = _defineLocalProperty('name') |  137   name = _defineLocalProperty('name') | 
|  138   galleryID = _defineLocalProperty('galleryID', '') |  138   galleryID = _defineLocalProperty('galleryID', '') | 
 |  139   devbuildGalleryID = _defineLocalProperty('devbuildGalleryID', '') | 
|  139   downloadPage = _defineLocalProperty('downloadPage', '') |  140   downloadPage = _defineLocalProperty('downloadPage', '') | 
|  140   experimental = _defineLocalProperty('experimental', '') |  141   experimental = _defineLocalProperty('experimental', '') | 
|  141   clientID = _defineLocalProperty('clientID', '') |  142   clientID = _defineLocalProperty('clientID', '') | 
|  142   clientSecret = _defineLocalProperty('clientSecret', '') |  143   clientSecret = _defineLocalProperty('clientSecret', '') | 
|  143   refreshToken = _defineLocalProperty('refreshToken', '') |  144   refreshToken = _defineLocalProperty('refreshToken', '') | 
|  144  |  145  | 
|  145   latestRevision = _defineNightlyProperty('latestRevision') |  146   latestRevision = _defineNightlyProperty('latestRevision') | 
|  146  |  147  | 
|  147   def __init__(self, config, nightlyConfig, repositoryName, repository): |  148   def __init__(self, config, nightlyConfig, repositoryName, repository): | 
|  148     """ |  149     """ | 
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  208       except M2Crypto.X509.X509Error: |  209       except M2Crypto.X509.X509Error: | 
|  209         raise Exception('No safari developer certificate found in chain') |  210         raise Exception('No safari developer certificate found in chain') | 
|  210  |  211  | 
|  211       subject = cert.get_subject() |  212       subject = cert.get_subject() | 
|  212       for entry in subject.get_entries_by_nid(subject.nid['CN']): |  213       for entry in subject.get_entries_by_nid(subject.nid['CN']): | 
|  213         m = re.match(r'Safari Developer: \((.*?)\)', entry.get_data().as_text()) |  214         m = re.match(r'Safari Developer: \((.*?)\)', entry.get_data().as_text()) | 
|  214         if m: |  215         if m: | 
|  215           return m.group(1) |  216           return m.group(1) | 
|  216   finally: |  217   finally: | 
|  217     bio.close() |  218     bio.close() | 
| OLD | NEW |