From 4ceb9ad72e5cf2a851b8808508c3dae8f5fd34e7 Mon Sep 17 00:00:00 2001 From: PiRSquared17 Date: Sat, 20 Sep 2014 20:07:49 -0400 Subject: [PATCH] Preserve default headers, fixing openwrt test --- dumpgenerator.py | 6 +++--- testing/test_dumpgenerator.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dumpgenerator.py b/dumpgenerator.py index b8a77ca..e09dd79 100644 --- a/dumpgenerator.py +++ b/dumpgenerator.py @@ -1070,7 +1070,7 @@ def getParameters(params=[]): session = requests.Session() session.cookies = cj - session.headers = {'User-Agent': getUserAgent()} + session.headers.update({'User-Agent': getUserAgent()}) if args.user and args.password: session.auth = (args.user, args.password) # session.mount(args.api.split('/api.php')[0], HTTPAdapter(max_retries=max_ret)) @@ -1496,7 +1496,7 @@ def getWikiEngine(url=''): """ Returns the wiki engine of a URL, if known """ session = requests.Session() - session.headers = {'User-Agent': getUserAgent()} + session.headers.update({'User-Agent': getUserAgent()}) r = session.post(url=url) result = r.text @@ -1517,7 +1517,7 @@ def mwGetAPIAndIndex(url=''): api = '' index = '' session = requests.Session() - session.headers = {'User-Agent': getUserAgent()} + session.headers.update({'User-Agent': getUserAgent()}) r = session.post(url=url) result = r.text diff --git a/testing/test_dumpgenerator.py b/testing/test_dumpgenerator.py index 60e80ea..8d77d1f 100644 --- a/testing/test_dumpgenerator.py +++ b/testing/test_dumpgenerator.py @@ -170,7 +170,7 @@ class TestDumpgenerator(unittest.TestCase): def test_getWikiEngine(self): tests = [ ['https://www.dokuwiki.org', 'DokuWiki'], - #['http://wiki.openwrt.org', 'DokuWiki'], + ['http://wiki.openwrt.org', 'DokuWiki'], ['http://skilledtests.com/wiki/', 'MediaWiki'], ['http://moinmo.in', 'MoinMoin'], ['https://wiki.debian.org', 'MoinMoin'],