Skip to content

add timeout for webservice #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2014
Merged

add timeout for webservice #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions geoip2/webservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

"""

import sys

import geoip2
import geoip2.models
import requests
Expand All @@ -33,18 +35,17 @@
GeoIP2Error, HTTPError, InvalidRequestError,
OutOfQueriesError)

import sys

if sys.version_info[0] == 2 or (sys.version_info[0] == 3
and sys.version_info[1] < 3):
import ipaddr as ipaddress # pylint:disable=F0401

ipaddress.ip_address = ipaddress.IPAddress
else:
import ipaddress # pylint:disable=F0401


class Client(object):

"""Creates a new client object.

It accepts the following required arguments:
Expand Down Expand Up @@ -88,13 +89,14 @@ class Client(object):
"""

def __init__(self, user_id, license_key, host='geoip.maxmind.com',
locales=None):
locales=None, timeout=None):
if locales is None:
locales = ['en']
self._locales = locales
self._user_id = user_id
self._license_key = license_key
self._base_uri = 'https://%s/geoip/v2.1' % host
self._timeout = timeout

def city(self, ip_address='me'):
"""This method calls the GeoIP2 Precision City endpoint.
Expand Down Expand Up @@ -140,7 +142,8 @@ def _response_for(self, path, model_class, ip_address):
uri = '/'.join([self._base_uri, path, ip_address])
response = requests.get(uri, auth=(self._user_id, self._license_key),
headers={'Accept': 'application/json',
'User-Agent': self._user_agent()})
'User-Agent': self._user_agent()},
timeout=self._timeout)
if response.status_code == 200:
body = self._handle_success(response, uri)
return model_class(body, locales=self._locales)
Expand Down Expand Up @@ -214,6 +217,8 @@ def _handle_non_200_status(self, status, uri):
raise HTTPError('Received a very surprising HTTP status '
'(%(status)i) for %(uri)s' % locals(), status,
uri)


"""

:copyright: (c) 2014 by MaxMind, Inc.
Expand Down