Merge pull request #26 from SlicingDice/feature/compatibilize-client-with-python3

Compatibilize slicingdice-python client with python 3

Author: jadsonmonteiro

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+### Updated
+- Make client compatible with python 3
+
 ## [2.0.0]
 ### Updated
 - Update `exists_entity()` to receive `table` as parameter

README.md

@@ -19,8 +19,6 @@ Whether you want to test the client installation or simply check more examples o
 
 In order to install the Python client, you only need to use [`pip`](https://packaging.python.org/installing/).
 
-**IMPORTANT:** Currently we only support Python 2.7
-
 ```bash
 pip install pyslicer --extra-index-url=https://packagecloud.io/slicingdice/clients/pypi/simple
 ```
@@ -63,7 +61,7 @@ query_data = {
         }
     ]
 }
-print client.count_entity(query_data)
+print(client.count_entity(query_data))
 ```
 
 ## Reference
@@ -93,7 +91,7 @@ Get information about current database(related to api keys informed on construct
 ```python
 from pyslicer import SlicingDice
 client = SlicingDice('MASTER_API_KEY', uses_test_endpoint=False)
-print client.get_database()
+print(client.get_database())
 ```
 
 #### Output example
@@ -115,7 +113,7 @@ Get all created columns, both active and inactive ones. This method corresponds
 ```python
 from pyslicer import SlicingDice
 client = SlicingDice('MASTER_API_KEY', uses_test_endpoint=False)
-print client.get_columns()
+print(client.get_columns())
 ```
 
 #### Output example
@@ -161,7 +159,7 @@ column = {
     "description": "Year of manufacturing",
     "storage": "latest-value"
 }
-print client.create_column(column)
+print(client.create_column(column))
 ```
 
 #### Output example
@@ -216,7 +214,7 @@ insert_data = {
     },
     "auto-create": ["table", "column"]
 }
-print client.insert(insert_data)
+print(client.insert(insert_data))
 ```
 
 #### Output example
@@ -243,7 +241,7 @@ ids = [
     "user2@slicingdice.com",
     "user3@slicingdice.com"
 ]
-print client.exists_entity(ids)
+print(client.exists_entity(ids))
 ```
 
 #### Output example
@@ -271,7 +269,7 @@ Count the number of inserted entities in the whole database. This method corresp
 from pyslicer import SlicingDice
 client = SlicingDice('MASTER_OR_READ_API_KEY', uses_test_endpoint=False)
 
-print client.count_entity_total()
+print(client.count_entity_total())
 ```
 
 #### Output example
@@ -297,7 +295,7 @@ client = SlicingDice('MASTER_OR_READ_API_KEY', uses_test_endpoint=False)
 
 tables = ['default']
 
-print client.count_entity_total(tables)
+print(client.count_entity_total(tables))
 ```
 
 #### Output example
@@ -350,7 +348,7 @@ query = [
         "bypass-cache": False
     }
 ]
-print client.count_entity(query)
+print(client.count_entity(query))
 ```
 
 #### Output example
@@ -406,7 +404,7 @@ query = [
         "bypass-cache": True
     }
 ]
-print client.count_event(query)
+print(client.count_event(query))
 ```
 
 #### Output example
@@ -438,7 +436,7 @@ query = {
         "car-model": 3
     }
 }
-print client.top_values(query)
+print(client.top_values(query))
 ```
 
 #### Output example
@@ -499,7 +497,7 @@ query = {
         }
     ]
 }
-print client.aggregation(query)
+print(client.aggregation(query))
 ```
 
 #### Output example
@@ -537,7 +535,7 @@ Get all saved queries. This method corresponds to a [GET request at /query/saved
 ```python
 from pyslicer import SlicingDice
 client = SlicingDice('MASTER_API_KEY', uses_test_endpoint=False)
-print client.get_saved_queries()
+print(client.get_saved_queries())
 ```
 
 #### Output example
@@ -606,7 +604,7 @@ query = {
     ],
     "cache-period": 100
 }
-print client.create_saved_query(query)
+print(client.create_saved_query(query))
 ```
 
 #### Output example
@@ -659,7 +657,7 @@ new_query = {
     ],
     "cache-period": 100
 }
-print client.update_saved_query('my-saved-query', new_query)
+print(client.update_saved_query('my-saved-query', new_query))
 ```
 
 #### Output example
@@ -695,7 +693,7 @@ Executed a saved query at SlicingDice. This method corresponds to a [GET request
 ```python
 from pyslicer import SlicingDice
 client = SlicingDice('MASTER_OR_READ_API_KEY', uses_test_endpoint=False)
-print client.get_saved_query('my-saved-query')
+print(client.get_saved_query('my-saved-query'))
 ```
 
 #### Output example
@@ -732,7 +730,7 @@ Delete a saved query at SlicingDice. This method corresponds to a [DELETE reques
 ```python
 from pyslicer import SlicingDice
 client = SlicingDice('MASTER_API_KEY', uses_test_endpoint=False)
-print client.delete_saved_query('my-saved-query')
+print(client.delete_saved_query('my-saved-query'))
 ```
 
 #### Output example
@@ -784,7 +782,7 @@ query = {
     "columns": ["car-model", "year"],
     "limit": 2
 }
-print client.result(query)
+print(client.result(query))
 ```
 
 #### Output example
@@ -832,7 +830,7 @@ query = {
     "columns": ["car-model", "year"],
     "limit": 2
 }
-print client.score(query)
+print(client.score(query))
 ```
 
 #### Output example

pyslicer/__init__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from client import SlicingDice
+from .client import SlicingDice

pyslicer/api.py

@@ -5,10 +5,9 @@
 import ujson
 import requests
 
-import pyslicer.exceptions as exceptions
-
-from pyslicer.core.handler_response import SDHandlerResponse
-from pyslicer.core.requester import Requester
+from . import exceptions
+from .core.handler_response import SDHandlerResponse
+from .core.requester import Requester
 
 
 class SlicingDiceAPI(object):

pyslicer/client.py

@@ -18,19 +18,18 @@
 """A library that provides a Python client to Slicing Dice API"""
 import ujson
 
-import pyslicer.utils.validators as validators
-import pyslicer.exceptions as exceptions
-
-from pyslicer.api import SlicingDiceAPI
-from pyslicer.url_resources import URLResources
+from . import exceptions
+from .api import SlicingDiceAPI
+from .url_resources import URLResources
+from .utils import validators
 
 
 class SlicingDice(SlicingDiceAPI):
     """A python interface to Slicing Dice API
 
     Example usage:
 
-        To create an object of the SliceDicer:
+        To create an object of the SlicingDice:
 
             from pyslicer.api import SlicingDice
             sd = SlicingDice('my-token')

pyslicer/core/helper_handler_exceptions.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import pyslicer.exceptions as exceptions
-
+from .. import exceptions
 from collections import defaultdict
 
 

pyslicer/core/requester.py

@@ -3,7 +3,7 @@
 
 import requests
 
-import pyslicer.exceptions as exceptions
+from .. import exceptions
 
 
 class Requester(object):

pyslicer/utils/validators.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 import abc
+import six
 
-import pyslicer.exceptions as exceptions
-
+from .. import exceptions
 from pyslicer.utils.data_utils import is_str_empty
 
 MAX_QUERY_SIZE = 10
@@ -142,7 +142,7 @@ def exceeds_columns_limit(self):
         Returns:
             false if don't exceeds the limit
         """
-        for key, value in self.data.iteritems():
+        for key, value in six.iteritems(self.data):
             if len(value) > 6:
                 raise exceptions.MaxLimitException(
                     "The query '{0}' exceeds the limit of columns "
@@ -159,7 +159,7 @@ def exceeds_values_contains_limit(self):
         Returns:
             false if don't exceeds the limit
         """
-        for key, value in self.data.iteritems():
+        for key, value in six.iteritems(self.data):
             if "contains" in value and len(value['contains']) > 5:
                 raise exceptions.MaxLimitException(
                     "The query '{0}' exceeds the limit of contains "

setup.py

@@ -11,7 +11,7 @@ def read(fname):
     author="SlicingDice LLC",
     author_email="help@slicingdice.com",
     description="Official Python client for SlicingDice, Data Warehouse and Analytics Database as a Service.",
-    install_requires=["requests", "ujson"],
+    install_requires=["requests", "six", "ujson"],
     license="BSD",
     keywords="slicingdice slicing dice data analysis analytics database",
     packages=[