Fixed rebasing issues

Author: oschwald

geoip2/webservices.py

@@ -208,7 +208,6 @@ def _response_for(self, path, model_class, ip_address):
                                 headers={'Accept': 'application/json',
                                          'User-Agent': self._user_agent()})
         if (response.status_code == 200):  #pylint:disable=E1103
-        if (response.status_code == 200):
             body = self._handle_success(response, uri)
             return model_class(body, languages=self.languages)
         else:
@@ -257,10 +256,10 @@ def _handle_4xx_status(self, response, status, uri):
                         'Response contains JSON but it does not specify '
                         'code or error keys', status, uri)
         elif response.content:
-            raise GeoIP2HTTPError('Received a %i for %s with the following '
-                                  'body: %s' %
-                                  (status, uri, response.content),
-                                  status, uri)
+            raise HTTPError('Received a %i for %s with the following '
+                            'body: %s' %
+                            (status, uri, response.content),
+                            status, uri)
         else:
             raise HTTPError('Received a %(status)i error for %(uri)s '
                             'with no body.' % locals(), status, uri)

tests/webservices_test.py

@@ -128,12 +128,10 @@ def test_no_body_error(self):
         httpretty.register_uri(httpretty.GET,
                                self.base_uri + 'country/' + '1.2.3.7',
                                body ='',
-                               status=400)
-        with self.assertRaisesRegex(HTTPError,
                                status=400,
                                content_type = self._content_type('country'))
         with self.assertRaisesRegex(HTTPError,
-                                    'Received a 400 error for .* with no body'):
+                               'Received a 400 error for .* with no body'):
             self.client.country('1.2.3.7')
 
     def test_weird_body_error(self):
@@ -164,7 +162,7 @@ def test_bad_body_error(self):
                                body='bad body',
                                status=400,
                                content_type = 'text/plain')
-        with self.assertRaisesRegex(GeoIP2HTTPError,
+        with self.assertRaisesRegex(HTTPError,
                                     'Received a .* with the following body'
                                     ):
             self.client.country('1.2.3.9')