Issue 4339 - Replace M2Crypto by PyCrypto

packagerSafari.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import base64
 import ConfigParser
 import json
 import os
 import re
 from urlparse import urlparse
@@ skipping 106 matching lines @@
         data = file.read()
 
     certificates = []
     key = None
     for match in re.finditer(r'-+BEGIN (.*?)-+(.*?)-+END \1-+', data, re.S):
         section = match.group(1)
         if section == 'CERTIFICATE':
             certificates.append(base64.b64decode(match.group(2)))
         elif section == 'PRIVATE KEY':
             key = RSA.importKey(match.group(0))
-    if key is None:

[Sebastian Noack, 2016/08/17 18:34:11]

Nit: Use |not x| instead |x is None| if it doesn't make a difference (it doesn't
here), so that it reads more like human language, hence is easier to parse by
humans.

[Wladimir Palant, 2016/08/17 19:21:12]

Done.

-        raise Exception('Cound not find private key in file')

[Sebastian Noack, 2016/08/17 18:34:11]

Typo: Cound -> Couldn't

[Wladimir Palant, 2016/08/17 19:21:12]

Done.

+    if not key:
+        raise Exception('Could not find private key in file')
 
     return certificates, key
 
 
 def _get_sequence(data):
     from Crypto.Util import asn1
     sequence = asn1.DerSequence()
     sequence.decode(data)
     return sequence
 
@@ skipping 149 matching lines @@
     fixAbsoluteUrls(files)
 
     dirname = metadata.get('general', 'basename') + '.safariextension'
     for filename in files.keys():
         files[os.path.join(dirname, filename)] = files.pop(filename)
 
     if not devenv and keyFile:
         createSignedXarArchive(outFile, files, certs, key)
     else:
         files.zip(outFile)