diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 21:33:31 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 21:33:31 +0100 |
commit | 784b6d3a9bc79fe55a8b132fd10555c1e9a61c31 (patch) | |
tree | e9a7996c44fd8d07f0bef5cdebbafdbe9c0b7bb4 /devscripts/gh-pages | |
parent | f3a34072266c0a7595f73fa032685cf8a50d2ab4 (diff) | |
parent | 2514d2635e0c8ff0fb72d00a093a849001df2bdd (diff) |
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'devscripts/gh-pages')
-rwxr-xr-x | devscripts/gh-pages/generate-download.py | 3 | ||||
-rwxr-xr-x | devscripts/gh-pages/sign-versions.py | 18 | ||||
-rwxr-xr-x | devscripts/gh-pages/update-copyright.py | 2 | ||||
-rwxr-xr-x | devscripts/gh-pages/update-feed.py | 1 | ||||
-rwxr-xr-x | devscripts/gh-pages/update-sites.py | 1 |
5 files changed, 11 insertions, 14 deletions
diff --git a/devscripts/gh-pages/generate-download.py b/devscripts/gh-pages/generate-download.py index 55912e12c..e90c787fd 100755 --- a/devscripts/gh-pages/generate-download.py +++ b/devscripts/gh-pages/generate-download.py @@ -1,8 +1,5 @@ #!/usr/bin/env python3 import hashlib -import shutil -import subprocess -import tempfile import urllib.request import json diff --git a/devscripts/gh-pages/sign-versions.py b/devscripts/gh-pages/sign-versions.py index 8a824df56..953a5162e 100755 --- a/devscripts/gh-pages/sign-versions.py +++ b/devscripts/gh-pages/sign-versions.py @@ -11,22 +11,22 @@ except NameError: versions_info = json.load(open('update/versions.json')) if 'signature' in versions_info: - del versions_info['signature'] + del versions_info['signature'] print('Enter the PKCS1 private key, followed by a blank line:') privkey = b'' while True: - try: - line = input() - except EOFError: - break - if line == '': - break - privkey += line.encode('ascii') + b'\n' + try: + line = input() + except EOFError: + break + if line == '': + break + 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() print('signature: ' + signature) versions_info['signature'] = signature -json.dump(versions_info, open('update/versions.json', 'w'), indent=4, sort_keys=True)
\ No newline at end of file +json.dump(versions_info, open('update/versions.json', 'w'), indent=4, sort_keys=True) diff --git a/devscripts/gh-pages/update-copyright.py b/devscripts/gh-pages/update-copyright.py index 12c2a9194..5bc5c6514 100755 --- a/devscripts/gh-pages/update-copyright.py +++ b/devscripts/gh-pages/update-copyright.py @@ -5,7 +5,7 @@ from __future__ import with_statement import datetime import glob -import io # For Python 2 compatibilty +import io # For Python 2 compatibilty import os import re diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py index 0ba15ae0f..46373a8db 100755 --- a/devscripts/gh-pages/update-feed.py +++ b/devscripts/gh-pages/update-feed.py @@ -73,4 +73,3 @@ atom_template = atom_template.replace('@ENTRIES@', entries_str) with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file: atom_file.write(atom_template) - diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py index 153e15c8a..0d526784d 100755 --- a/devscripts/gh-pages/update-sites.py +++ b/devscripts/gh-pages/update-sites.py @@ -9,6 +9,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath( import youtube_dl + def main(): with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf: template = tmplf.read() |