From b1685991060cb91c6c800d620e6ca941d835bbfb Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Tue, 28 Aug 2018 17:40:24 +0530 Subject: [PATCH] docs: Fix MediaWiki manual page download failing - Removed an unnecessary and dangerous optimization which was added earlier. Fixes #1369 Signed-off-by: Joseph Nuthalapati Reviewed-by: James Valleroy --- doc/fetch-manual-pages | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/doc/fetch-manual-pages b/doc/fetch-manual-pages index ebb5471be..073526e1f 100755 --- a/doc/fetch-manual-pages +++ b/doc/fetch-manual-pages @@ -18,7 +18,6 @@ import re import urllib.request -from subprocess import PIPE, Popen MANUAL_PAGE_URL = "https://wiki.debian.org/FreedomBox/Manual/{}?action=show&mimetype=text%2Fdocbook" @@ -29,7 +28,9 @@ manual_pages = [] to_remove = ['QuickStart', 'GettingHelp', 'Developer'] -def write_manual_pages(): +def list_manual_pages(): + """Fetch the list of manual pages and write them to a file. + """ pattern = 'FreedomBox/Manual/\w+' lst = list(urllib.request.urlopen(MANUAL_INDEX_RAW_URL)) global manual_pages @@ -45,19 +46,12 @@ def write_manual_pages(): def fetch_manual_pages_in_docbook_format(): for page in manual_pages: url = MANUAL_PAGE_URL.format(page) - p1 = Popen(['wget', '--quiet', '-O', '-', url], stdout=PIPE) - p2 = Popen(['xmllint', '--format', '-'], stdin=p1.stdout, stdout=PIPE) - p1.stdout.close() - with open('{}.raw.xml'.format(page), 'w') as docbook: - p3 = Popen( - ['egrep', '-v', 'linkend|Category|Commons|HELP|Back to'], - stdin=p2.stdout, stdout=docbook) - p2.stdout.close() - p3.communicate() + filename = '{}.raw.xml'.format(page) + urllib.request.urlretrieve(url, filename) def main(): - write_manual_pages() + list_manual_pages() fetch_manual_pages_in_docbook_format()