Merge branch 'feature/integrate-circleci' of github.com:SlicingDice/slicingdice-python into feature/integrate-circleci

Author: batistahermogenes

pyslicer/api.py

@@ -45,7 +45,8 @@ def status_code(self):
     def headers(self):
         return self.__headers
 
-    def _organize_keys(self, master_key, custom_key, read_key, write_key):
+    @staticmethod
+    def _organize_keys(master_key, custom_key, read_key, write_key):
         return {
             "master_key": master_key,
             "custom_key": custom_key,
@@ -130,7 +131,8 @@ def _handler_request(self, req):
                 self._set_properties_values(sd_response)
                 return sd_response.result
 
-    def _check_request(self, request):
+    @staticmethod
+    def _check_request(request):
         """Check if the request was successful
 
         Keyword arguments:

pyslicer/client.py

@@ -125,7 +125,8 @@ def _data_extraction_wrapper(self, url, query):
                 req_type="post",
                 key_level=0)
 
-    def _wrapper_test(self, test):
+    @staticmethod
+    def _wrapper_test(test):
         base_url = SlicingDice.BASE_URL
         if test:
             base_url += "/test"

pyslicer/exceptions.py

@@ -565,7 +565,7 @@ def __init__(self, *args, **kwargs):
 
 class QueryCountInvalidParameterErrorException(SlicingDiceException):
     def __init__(self, *args, **kwargs):
-        super(QueryLevelLimitException, self).__init__(
+        super(QueryCountInvalidParameterErrorException, self).__init__(
             self, *args, **kwargs)
 
 

pyslicer/url_resources.py

@@ -13,5 +13,5 @@ class URLResources(object):
     QUERY_TOP_VALUES = "/query/top_values/"
     QUERY_EXISTS_ENTITY = "/query/exists/entity/"
     QUERY_SAVED = "/query/saved/"
-    QUERY_DATA_EXTRACTION_RESULT = "/query/data_extraction/result/"
-    QUERY_DATA_EXTRACTION_SCORE = "/query/data_extraction/score/"
+    QUERY_DATA_EXTRACTION_RESULT = "/data_extraction/result/"
+    QUERY_DATA_EXTRACTION_SCORE = "/data_extraction/score/"

pyslicer/utils/validators.py

@@ -138,7 +138,7 @@ def __init__(self, queries):
     def _valid_keys(self):
         if "fields" in self.data:
             value = self.data["fields"]
-            if type(value) != list:
+            if not isinstance(value, list):
                 raise exceptions.InvalidQueryException(
                     "The key 'fields' in query has a invalid value.")
             else:
@@ -148,7 +148,7 @@ def _valid_keys(self):
                         "have up to 10 fields.")
         if "limit" in self.data:
             limit = self.data['limit']
-            if type(limit) != int:
+            if not isinstance(limit, int):
                 raise exceptions.InvalidQueryException(
                     "The key 'limit' in query has a invalid value.")
             if limit > 100:
@@ -178,7 +178,7 @@ def _has_empty_field(self):
         if not all(self.data) or not all(self.data.values()):
             raise exceptions.InvalidIndexException(
                 "This index has invalid keys or values.")
-        for id, value in self.data.iteritems():
+        for value in self.data.values():
             # Value is a dictionary when it is an entity being indexed:
             # "my-entity": {"year": 2016}
             # It can also be a parameter, such as "auto-create-fields":

setup.py

@@ -7,7 +7,7 @@ def read(fname):
 
 setup(
     name="pyslicer",
-    version="0.1.1",
+    version="1.0.0",
     author="SlicingDice LLC",
     author_email="help@slicingdice.com",
     description="Official Python client for SlicingDice, Data Warehouse and Analytics Database as a Service.",