pylint import fix and 3.2 fix.

Author: oschwald

.travis.yml

@@ -11,8 +11,8 @@ install:
   - pip install -r requirements.txt
   - pip install git+https://github.com/maxmind/HTTPretty.git
   - pip install pylint coveralls
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ipaddr; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install ipaddr; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != '3.3' ]]; then pip install ipaddr; fi
 
 script:
   - coverage run --source=geoip2 setup.py test

geoip2/webservices.py

@@ -102,11 +102,12 @@
 
 import sys
 
-if sys.version_info[0] == 2:
-    import ipaddr as ipaddress
+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
+    import ipaddress #pylint:disable=F0401
 
 class Client(object):
     """This method creates a new client object.

setup.py

@@ -18,7 +18,8 @@
 
 requirements = [i.strip() for i in open("requirements.txt").readlines()]
 
-if sys.version_info[0] == 2:
+if sys.version_info[0] == 2 or (sys.version_info[0] == 3
+                                and sys.version_info[1] < 3):
     requirements.append('ipaddr')
 
 setup(