Merge pull request #252 from ebreton/master

A few adjustments after a fresh install

.gitignore

@@ -1,6 +1,7 @@
 .cache
 geocoder/__pycache__/
 .coverage
+htmlcov
 MANIFEST
 coverage.xml
 nosetests.xml
@@ -18,7 +19,9 @@ geocoder.egg-info/
 *.egg
 *.pyo
 env/
+.env
 .idea
+.vscode
 .workon
 
 t.py

Makefile

@@ -7,7 +7,9 @@ init:
 	pip install -r requirements.txt
 
 test:
-	py.test tests
+	flake8 --ignore=E305,E501 geocoder
+	py.test --cov=./ tests
+	coverage html
 
 clean:
 	python setup.py clean --all

geocoder/freegeoip.py

@@ -108,10 +108,6 @@ def offset(self):
     def organization(self):
         return self.parse.get('organization')
 
-    @property
-    def offset(self):
-        return self.parse.get('offset')
-
     @property
     def ip(self):
         return self.parse.get('ip')

geocoder/geocodefarm.py

@@ -2,7 +2,6 @@
 # coding: utf8
 
 from __future__ import absolute_import
-import six
 from geocoder.base import Base
 from geocoder.keys import geocodefarm_key
 

geocoder/geocodefarm_reverse.py

@@ -2,7 +2,6 @@
 # coding: utf8
 
 from __future__ import absolute_import
-import six
 from geocoder.base import Base
 from geocoder.location import Location
 from geocoder.geocodefarm import GeocodeFarm

geocoder/google_places.py

@@ -2,7 +2,6 @@
 # coding: utf8
 
 from __future__ import absolute_import
-import time
 from geocoder.base import Base
 from geocoder.keys import google_key
 

geocoder/here.py

@@ -2,7 +2,6 @@
 # coding: utf8
 
 from __future__ import absolute_import
-import six
 from geocoder.base import Base
 from geocoder.keys import here_app_id, here_app_code
 

requirements-dev.txt

@@ -4,7 +4,10 @@ click==6.7
 decorator==4.1.2
 idna==2.5
 py==1.4.34
+flake8==3.3.0
 pytest==3.1.3
+codecov==2.0.9
+pytest-cov==2.5.1
 ratelim==0.1.6
 requests==2.18.1
 six==1.10.0

tests/test_session.py

@@ -2,9 +2,12 @@
 # coding: utf8
 
 import geocoder
-import mock
 import requests
 
+try:
+    import mock
+except ImportError:
+    from unittest import mock
 
 address = 'Booth Street, Ottawa'