From: Philipp Hagemeister Date: Sat, 12 Jan 2013 17:12:24 +0000 (+0100) Subject: Python 2-proof versions.py X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=1841f65e64e6d01631c2ef341493142813cfa028;p=youtube-dl Python 2-proof versions.py --- diff --git a/devscripts/gh-pages/sign-versions.py b/devscripts/gh-pages/sign-versions.py index dd126df52..00cecce0c 100755 --- a/devscripts/gh-pages/sign-versions.py +++ b/devscripts/gh-pages/sign-versions.py @@ -1,15 +1,20 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python 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()