query added

Author: ishaileshmishra

contentstack/__init__.py

@@ -23,8 +23,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Export module packages."""
-
 # from .stack import Stack
 from .entry import Entry
 from .asset import Asset
@@ -38,7 +36,7 @@
 
 __author__ = "Shailesh Mishra <mshaileshr@gmail.com>"
 __status__ = "debug"
-__date__ = "27 June 2019"
+__date__ = "01 July 2019"
 __version__ = "1.0.0"
 __endpoint__ = "cdn.contentstack.io"
 

contentstack/asset_library.py

@@ -25,6 +25,15 @@
 
 from contentstack import http_request
 
+"""
+contentstack.asset_library
+~~~~~~~~~~~~~~~~~~
+This module implements the AssetLibrary class.
+API Reference: https://www.contentstack.com/docs/apis/content-delivery-api/#assets
+
+"""
+
+
 
 class AssetLibrary():
 

contentstack/http_request.py

@@ -1,8 +1,7 @@
+from urllib import parse
 import requests
-from urllib3.util import timeout
+from requests import Response
 from contentstack import config
-import urllib.parse
-import logging
 
 
 class HTTPRequestConnection(object):
@@ -20,7 +19,11 @@ def __init__(self, url_path, query=dict, local_headers=dict):
             self._query_prams['environment'] = self._local_headers['environment']
 
     def http_request(self) -> tuple:
-        response = requests.get(self.url_path, params=self._query_prams, headers=self._local_headers)
+        payload = parse.urlencode(query=self._query_prams, encoding='UTF-8')
+        print("encoded prams", payload)
+        response: Response = requests.get(self.url_path, params=payload, headers=self._local_headers)
+        var_url = response.url
+
         if response.ok:
             self.result = response.json()
         else:

contentstack/utils.py

@@ -41,12 +41,11 @@ class utils:
     def __init__(self):
         log.error('logging called in utils')
         pass
+
     '''def is_internet_on():
         try: urllib.request.urlopen('http://216.58.192.142', timeout=1)
         #return True
     except urllib2.URLError as err: 
         return False'''
 
 
-util = utils()
-

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "contentstack.py",
+  "name": "contentstack.python",
   "version": "1.0.0",
   "dependencies": {
 

setup.py

@@ -1,9 +1,19 @@
-"""contentstack - decorator heavy REST client library for Python."""
+# !/usr/bin/env python
+# distutils/setuptools install script.
 
 from setuptools import setup, find_packages
 import os
 import re
 
+ROOT = os.path.dirname(__file__)
+VERSION_RE = re.compile(r'''__version__ = ['"]([0-9.]+)['"]''')
+
+
+def get_version():
+    init = open(os.path.join(ROOT, 'contentstack', '__init__.py')).read()
+    return VERSION_RE.search(init).group(1)
+
+
 package = 'contentstack'
 
 
@@ -17,20 +27,12 @@ def read(fname):
     'python-dateutil'
 ]
 
-
-def get_version():
-    """Return package version as listed in `__version__` in `init.py`."""
-    init_py = open('decorest/__init__.py').read()
-    return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
-
-
-version = get_version()
-
 setup(
-    name='contentstack-python',
-    version=version,
+
+    name='contentstack',
+    version=get_version(),
     packages=find_packages(exclude=['tests']),
-    url='https://www.contentstack.com',
+    url='https://github.com/contentstack/contentstack-python',
     license='MIT License',
     author='Shailesh Mishra',
     author_email='shailesh.mishra@contentstack.com',
@@ -39,13 +41,13 @@ def get_version():
     tests_require=['pytest'],
     long_description=read('README.rst'),
     include_package_data=True,
+
     classifiers=[
-        'Development Status :: 1 - Alpha',
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
         'Intended Audience :: Developers',
         'Natural Language :: English',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6'
-    ]
+        'Programming Language :: Python :: 3.7',
+    ],
 )