diff --git a/dumpgenerator.py b/dumpgenerator.py index 53f568a..1e0dabb 100755 --- a/dumpgenerator.py +++ b/dumpgenerator.py @@ -1762,7 +1762,7 @@ def getParameters(params=[]): # Execute meta info params if args.wiki: if args.get_wiki_engine: - print getWikiEngine(url=args.wiki) + print getWikiEngine(session, url=args.wiki) sys.exit() # Create session @@ -1802,8 +1802,8 @@ def getParameters(params=[]): index = args.index and args.index or '' if api == '' or index == '': if args.wiki: - if getWikiEngine(args.wiki) == 'MediaWiki': - api2, index2 = mwGetAPIAndIndex(args.wiki) + if getWikiEngine(session, args.wiki) == 'MediaWiki': + api2, index2 = mwGetAPIAndIndex(session, args.wiki) if not api: api = api2 if not index: @@ -2379,11 +2379,9 @@ def avoidWikimediaProjects(config={}, other={}): sys.exit() -def getWikiEngine(url=''): +def getWikiEngine(session, url): """ Returns the wiki engine of a URL, if known """ - session = requests.Session() - session.headers.update({'User-Agent': getUserAgent()}) r = session.post(url=url, timeout=30) if r.status_code == 405 or r.text == '': r = session.get(url=url, timeout=120) @@ -2462,13 +2460,11 @@ def getWikiEngine(url=''): return wikiengine -def mwGetAPIAndIndex(url=''): +def mwGetAPIAndIndex(session, url): """ Returns the MediaWiki API and Index.php """ api = '' index = '' - session = requests.Session() - session.headers.update({'User-Agent': getUserAgent()}) r = session.post(url=url, timeout=120) result = r.text