static methods and removed unused import

Author: Rasmus Lager

ganapi/contact.py

@@ -15,7 +15,8 @@ class Contact(Entity):
     updated = None
     created = None
 
-    def hash_in_contacts_lists(self, hash, list):
+    @staticmethod
+    def hash_in_contacts_lists(hash, list):
 
         if any(sub['hash'] == hash for sub in list):
             return True

ganapi/entity_manager.py

@@ -4,6 +4,7 @@
 import urlparse
 import math
 
+
 class EntityManager(object):
     """
     Base entity manager.
@@ -166,7 +167,7 @@ def overwrite(self, entity):
         """
         return self.save(entity, True)
 
-    def query(self, filters=dict(), as_json=False):
+    def query(self, filters=None, as_json=False):
         """
         Low level method for making search queries.
 
@@ -179,6 +180,8 @@ def query(self, filters=dict(), as_json=False):
         :returns class PaginatedResultSet which can iterate over pages PaginatedResultSet.entities is the current page list of entities.
         :raises RequestException if there is an error from the API.
         """
+        if not filters:
+            filters = dict()
         uri = u'{base_path}/?{encoded_filters}'.format(base_path=str.rstrip(self.base_path),
                                                        encoded_filters=urllib.urlencode(filters))
         response = self.api.call('GET', uri)

ganapi/helpers.py

@@ -29,7 +29,8 @@ def build_entities_list(self, results):
             list.append(self.manager.construct_entity(result).set_persisted())
         return list
 
-    def url_params_to_dict(self, url):
+    @staticmethod
+    def url_params_to_dict(url):
         """
         :param url: url to get parameters from
         :return: parsed parameters as dict

ganapi/test_attribute_manager.py

@@ -2,7 +2,7 @@
 from api import Api
 from attribute import Attribute
 from attribute_manager import AttributeManager
-from httmock import HTTMock, all_requests, urlmatch
+from httmock import HTTMock, all_requests
 from requests import HTTPError
 
 

ganapi/test_contact.py

@@ -1,5 +1,4 @@
 from api import Api
-from contact import Contact
 from contact_manager import ContactManager
 from list_manager import ListManager
 import unittest
@@ -40,8 +39,6 @@ def contact_unsubscribe_mock(self, url, request):
         return {'status_code': 201,
                 'content': content}
 
-
-
     def test_subscribe_to_list(self):
         new_contact = self.contact_manager.create()
         new_contact.email = 'tester@example.com'
@@ -56,7 +53,6 @@ def test_subscribe_to_list(self):
             saved_contact = new_contact.save()
         self.assertEqual(saved_contact.lists[0]['hash'], '2anfLVM')
 
-
     def test_unsubcribe_from_list(self):
         new_contact = self.contact_manager.create()
         new_contact.email = 'tester@example.com'