Merge branch 'master' into subtitles_rework

[youtube-dl] / devscripts / gh-pages / sign-versions.py

diff --git a/devscripts/gh-pages/sign-versions.py b/devscripts/gh-pages/sign-versions.py
index dd126df52e72ea4720165579cb1ce7c4fbc5f94f..8a824df56fe7677868ca9b03aa24de8d4b6eba76 100755 (executable)
--- a/devscripts/gh-pages/sign-versions.py
+++ b/devscripts/gh-pages/sign-versions.py
@@ -4,12 +4,17 @@ import rsa
 import json
 from binascii import hexlify
 
+try:
+    input = raw_input
+except NameError:
+    pass
+
 versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
        del versions_info['signature']
 
 print('Enter the PKCS1 private key, followed by a blank line:')
-privkey = ''
+privkey = b''
 while True:
        try:
                line = input()
@@ -17,8 +22,7 @@ while True:
                break
        if line == '':
                break
-       privkey += line + '\n'
-privkey = bytes(privkey, 'ascii')
+       privkey += line.encode('ascii') + b'\n'
 privkey = rsa.PrivateKey.load_pkcs1(privkey)
 
 signature = hexlify(rsa.pkcs1.sign(json.dumps(versions_info, sort_keys=True).encode('utf-8'), privkey, 'SHA-256')).decode()