diff --git a/mwclient/client.py b/mwclient/client.py index ee38b303..4f39bb44 100644 --- a/mwclient/client.py +++ b/mwclient/client.py @@ -63,6 +63,8 @@ def __init__(self, host, path='/w/', ext='.php', pool=None, retry_timeout=30, self.max_lag = text_type(max_lag) self.force_login = force_login self.requests = reqs or {} + if 'timeout' not in self.requests: + self.requests['timeout'] = 30 # seconds if consumer_token is not None: auth = OAuth1(consumer_token, consumer_secret, access_token, access_secret) @@ -373,7 +375,9 @@ def raw_call(self, script, data, files=None, retry_on_error=True, http_method='P while True: try: - args = {'files': files, 'headers': headers, **self.requests} + args = {'files': files, 'headers': headers} + for k, v in self.requests.items(): + args[k] = v if http_method == 'GET': args['params'] = data else: