Retry Policy & Timeout

Author: shaileshmishra

CHANGELOG.md

@@ -7,9 +7,9 @@
 Date: 26-Feb-2021
 
 - Retry policy and timeout support included
-- set default timeout 30 sec
------------------------------
+- Set default timeout 30 sec
 
+-----------------------------
 
 ## _v1.2.0_
 

contentstack/__init__.py

@@ -12,7 +12,7 @@
 from .asset import Asset
 from .contenttype import ContentType
 from .https_connection import HTTPSConnection
-from .stack import Stack
+from contentstack.stack import Stack
 from .utility import Utils
 
 __title__ = 'contentstack-python'

contentstack/https_connection.py

@@ -8,11 +8,6 @@
 import logging
 import platform
 from json import JSONDecodeError
-
-import requests
-from requests.adapters import HTTPAdapter
-from requests.exceptions import HTTPError, Timeout
-
 import contentstack
 
 log = logging.getLogger(__name__)
@@ -52,6 +47,11 @@ def __init__(self, endpoint, headers, timeout, retry_strategy):
             self.retry_strategy = retry_strategy
 
     def get(self, url):
+
+        import requests
+        from requests.adapters import HTTPAdapter
+        from requests.exceptions import HTTPError, Timeout
+
         """
         Here we create a response object, `response` which will store the request-response.
         We use requests.get method since we are sending a GET request.

contentstack/image_transform.py

@@ -50,7 +50,8 @@ def get_url(self):
             >>> result = image_url.fetch()
         ------------------------------
         """
-        args = ['{0}={1}'.format(k, v) for k, v in self.image_params.items()]
+        # args = ['{0}={1}'.format(k, v) for k, v in self.image_params.items()]
+        args = ['{0}={1}'.format(k, v) for k, v in list(self.image_params.items())]
         if args:
             self.image_url += '?{0}'.format('&'.join(args))
         return self.image_url

coverage.svg

@@ -1,4 +1,9 @@
 {
   "name": "contentstack.python",
-  "version": "1.3.0"
+  "version": "1.3.0",
+  "developer": "shaileshmishra",
+  "license": "MIT",
+  "author": {"name": "shaileshmishra", "email": "mshaileshr@gmail.com"},
+  "homepage": "www.contentstack.com",
+  "readme": "./readme"
 }

package.json

@@ -1,12 +1,10 @@
-docutils==0.16
-keyring==21.5.0
-pkginfo==1.6.1
-requests==2.25.0
-pip~=20.3.1
-py~=1.9.0
-setuptools~=51.0.0
-wheel==0.35.1
-urllib3==1.26.3
-utils==1.0.1
-twython==3.8.2
-Sphinx==3.5.1
+twython~=3.8.2
+setuptools~=51.1.0
+urllib3~=1.26.2
+python-dateutil==2.8.1
+requests>=2.20.0,<3.0
+coverage==4.3.4
+tox==2.5.0
+virtualenv==15.1.0
+Sphinx==1.6.3
+sphinxcontrib-websupport==1.0.1

requirements.txt

@@ -5,8 +5,6 @@
 
 import os
 
-import contentstack
-
 try:
     from setuptools import setup
 except ImportError:
@@ -15,14 +13,19 @@
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
     long_description = readme.read()
 
+requirements = [
+    'requests>=2.20.0,<3.0',
+    'python-dateutil'
+]
+
 setup(
     title="contentstack-python",
     name="Contentstack",
     status="Active",
     type="process",
     created="09 Jun 2020",
-    keywords=contentstack.__title__,
-    version=contentstack.__version__,
+    keywords="contentstack-python",
+    version="1.3.0",
     author="Contentstack",
     author_email="shailesh.mishra@contentstack.com",
     description="Contentstack is a headless CMS with an API-first approach.",
@@ -32,15 +35,18 @@
     packages=['contentstack'],
     license='MIT',
     test_suite='tests',
-    install_requires=['requests>=1.1.0'],
+    install_requires=requirements,
     include_package_data=True,
+    universal=1,
     classifiers=[
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     python_requires='>=3.6',
     zip_safe=False,