Merge pull request #8 from maxmind/greg/private-attributes

Prefixed some attributes with an underscore

Author: borisz

geoip2/database.py

@@ -45,8 +45,8 @@ class Reader(object):
     def __init__(self, filename, locales=None):
         if locales is None:
             locales = ['en']
-        self.db_reader = maxminddb.Reader(filename)
-        self.locales = locales
+        self._db_reader = maxminddb.Reader(filename)
+        self._locales = locales
 
     def country(self, ip_address):
         """Get the Country record object for the IP address
@@ -99,14 +99,14 @@ def omni(self, ip_address):
         return self._model_for(geoip2.models.Omni, ip_address)
 
     def _model_for(self, model_class, ip_address):
-        record = self.db_reader.get(ip_address)
+        record = self._db_reader.get(ip_address)
         if record is None:
             raise geoip2.errors.AddressNotFoundError(
                 "The address %s is not in the database." % ip_address)
         record.setdefault('traits', {})['ip_address'] = ip_address
-        return model_class(record, locales=self.locales)
+        return model_class(record, locales=self._locales)
 
     def close(self):
         """Closes the GeoIP2 database"""
 
-        self.db_reader.close()
+        self._db_reader.close()

geoip2/webservice.py

@@ -29,8 +29,9 @@
 import geoip2.models
 import requests
 from requests.utils import default_user_agent
-from .errors import AddressNotFoundError, AuthenticationError, \
-    GeoIP2Error, HTTPError, InvalidRequestError, OutOfQueriesError
+from .errors import (AddressNotFoundError, AuthenticationError,
+                     GeoIP2Error, HTTPError, InvalidRequestError,
+                     OutOfQueriesError)
 
 import sys
 
@@ -90,9 +91,9 @@ def __init__(self, user_id, license_key, host='geoip.maxmind.com',
                  locales=None):
         if locales is None:
             locales = ['en']
-        self.locales = locales
-        self.user_id = user_id
-        self.license_key = license_key
+        self._locales = locales
+        self._user_id = user_id
+        self._license_key = license_key
         self._base_uri = 'https://%s/geoip/v2.0' % host
 
     def city(self, ip_address='me'):
@@ -149,12 +150,12 @@ def _response_for(self, path, model_class, ip_address):
         if ip_address != 'me':
             ip_address = str(ipaddress.ip_address(ip_address))
         uri = '/'.join([self._base_uri, path, ip_address])
-        response = requests.get(uri, auth=(self.user_id, self.license_key),
+        response = requests.get(uri, auth=(self._user_id, self._license_key),
                                 headers={'Accept': 'application/json',
                                          'User-Agent': self._user_agent()})
         if response.status_code == 200:
             body = self._handle_success(response, uri)
-            return model_class(body, locales=self.locales)
+            return model_class(body, locales=self._locales)
         else:
             self._handle_error(response, uri)