cs 3.3.0__tar.gz → 3.4.0__tar.gz

{cs-3.3.0/cs.egg-info → cs-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cs
-Version: 3.3.0
+Version: 3.4.0
 Summary: A simple yet powerful CloudStack API client for Python and the command-line.
 Home-page: https://github.com/ngine-io/cs
 Author: Bruno Renié
@@ -10,11 +10,11 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: requests
@@ -22,17 +22,25 @@ Provides-Extra: async
 Requires-Dist: aiohttp; extra == "async"
 Provides-Extra: highlight
 Requires-Dist: pygments; extra == "highlight"
+Dynamic: license-file
 
-CS
-==
+.. image:: https://github.com/ngine-io/cs/actions/workflows/main.yml/badge.svg
+   :alt: CI
+   :target: https://github.com/ngine-io/cs/actions/workflows/main.yml
+.. image:: https://img.shields.io/pypi/pyversions/cs.svg
+   :alt: Python versions
+   :target: https://pypi.org/project/cs/
+
+.. image:: https://img.shields.io/pypi/dw/cs.svg
+   :alt: Downloads / Week
+   :target: https://pypi.org/project/cs/
 
 .. image:: https://img.shields.io/pypi/l/cs.svg
    :alt: License
    :target: https://pypi.org/project/cs/
 
-.. image:: https://img.shields.io/pypi/pyversions/cs.svg
-   :alt: Python versions
-   :target: https://pypi.org/project/cs/
+CS - Python CloudStack API client 
+=================================
 
 A simple, yet powerful CloudStack API client for python and the command-line.
 

{cs-3.3.0 → cs-3.4.0}/README.rst

@@ -1,13 +1,20 @@
-CS
-==
+.. image:: https://github.com/ngine-io/cs/actions/workflows/main.yml/badge.svg
+   :alt: CI
+   :target: https://github.com/ngine-io/cs/actions/workflows/main.yml
+.. image:: https://img.shields.io/pypi/pyversions/cs.svg
+   :alt: Python versions
+   :target: https://pypi.org/project/cs/
+
+.. image:: https://img.shields.io/pypi/dw/cs.svg
+   :alt: Downloads / Week
+   :target: https://pypi.org/project/cs/
 
 .. image:: https://img.shields.io/pypi/l/cs.svg
    :alt: License
    :target: https://pypi.org/project/cs/
 
-.. image:: https://img.shields.io/pypi/pyversions/cs.svg
-   :alt: Python versions
-   :target: https://pypi.org/project/cs/
+CS - Python CloudStack API client 
+=================================
 
 A simple, yet powerful CloudStack API client for python and the command-line.
 

{cs-3.3.0 → cs-3.4.0}/cs/__init__.py

@@ -3,11 +3,7 @@ import json
 import os
 import sys
 from collections import defaultdict
-
-try:
-    from configparser import NoSectionError
-except ImportError:  # python 2
-    from ConfigParser import NoSectionError
+from configparser import NoSectionError
 
 try:
     import pygments
@@ -23,6 +19,7 @@ from .client import (
     CloudStackException,
     read_config,
 )
+from .version import __version__
 
 
 __all__ = [
@@ -32,15 +29,14 @@ __all__ = [
     "CloudStackApiException",
 ]
 
-if sys.version_info >= (3, 5):
-    try:
-        import aiohttp  # noqa
-    except ImportError:
-        pass
-    else:
-        from ._async import AIOCloudStack  # noqa
+try:
+    import aiohttp  # noqa
+except ImportError:
+    pass
+else:
+    from ._async import AIOCloudStack  # noqa
 
-        __all__.append("AIOCloudStack")
+    __all__.append("AIOCloudStack")
 
 
 def _format_json(data, theme):
@@ -56,7 +52,7 @@ def _format_json(data, theme):
 
 
 def main(args=None):
-    parser = argparse.ArgumentParser(description="Cloustack client.")
+    parser = argparse.ArgumentParser(description="Cloudstack client.")
     parser.add_argument(
         "--region",
         "-r",
@@ -97,7 +93,15 @@ def main(args=None):
         help="trace the HTTP requests done on stderr",
     )
     parser.add_argument(
-        "command", metavar="COMMAND", help="Cloudstack API command to execute"
+        "command",
+        metavar="COMMAND",
+        help="Cloudstack API command to execute",
+    )
+
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=__version__,
     )
 
     def parse_option(x):
@@ -116,6 +120,7 @@ def main(args=None):
     )
 
     options = parser.parse_args(args=args)
+
     command = options.command
     kwargs = defaultdict(set)
     for arg in options.arguments:
@@ -133,8 +138,10 @@ def main(args=None):
 
     if options.post:
         config["method"] = "post"
+
     if options.trace:
         config["trace"] = True
+
     cs = CloudStack(**config)
     ok = True
     response = None

{cs-3.3.0 → cs-3.4.0}/cs/client.py

@@ -1,6 +1,3 @@
-#! /usr/bin/env python
-from __future__ import print_function
-
 import base64
 import hashlib
 import hmac
@@ -8,42 +5,21 @@ import os
 import re
 import sys
 import time
+from configparser import ConfigParser
 from datetime import datetime, timedelta
 from fnmatch import fnmatch
-
-try:
-    from configparser import ConfigParser
-except ImportError:  # python 2
-    from ConfigParser import ConfigParser
-
-try:
-    from urllib.parse import quote
-except ImportError:  # python 2
-    from urllib import quote
+from urllib.parse import quote
 
 import pytz
 
 import requests
 from requests.structures import CaseInsensitiveDict
 
-PY2 = sys.version_info < (3, 0)
-
-if PY2:
-    text_type = unicode  # noqa
-    string_type = basestring  # noqa
-    integer_types = int, long  # noqa
-    binary_type = str
-else:
-    text_type = str
-    string_type = str
-    integer_types = int
-    binary_type = bytes
 
-if sys.version_info >= (3, 5):
-    try:
-        from . import AIOCloudStack  # noqa
-    except ImportError:
-        pass
+try:
+    from . import AIOCloudStack  # noqa
+except ImportError:
+    pass
 
 
 TIMEOUT = 10
@@ -124,8 +100,6 @@ def cs_encode(s):
 
     java.net.URLEncoder.encode(s).replace('+', '%20')
     """
-    if PY2 and isinstance(s, text_type):
-        s = s.encode("utf-8")
     return quote(s, safe="*")
 
 
@@ -146,11 +120,11 @@ def transform(params):
             params.pop(key)
             continue
 
-        if isinstance(value, (string_type, binary_type)):
+        if isinstance(value, (str, bytes)):
             continue
 
-        if isinstance(value, integer_types):
-            params[key] = text_type(value)
+        if isinstance(value, int):
+            params[key] = str(value)
         elif isinstance(value, (list, tuple, set, dict)):
             if not value:
                 params.pop(key)
@@ -166,7 +140,7 @@ def transform(params):
                     for index, val in enumerate(value):
                         for name, v in val.items():
                             k = "%s[%d].%s" % (key, index, name)
-                            params[k] = text_type(v)
+                            params[k] = str(v)
         else:
             raise ValueError(type(value))
 
@@ -606,7 +580,7 @@ def read_config(ini_group=None):
     # convert booleans values.
     bool_keys = ("dangerous_no_tls_verify",)
     for bool_key in bool_keys:
-        if isinstance(config[bool_key], string_type):
+        if isinstance(config[bool_key], str):
             try:
                 config[bool_key] = strtobool(config[bool_key])
             except ValueError:

cs-3.4.0/cs/version.py

@@ -0,0 +1 @@
+__version__ = "3.4.0"

{cs-3.3.0 → cs-3.4.0/cs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cs
-Version: 3.3.0
+Version: 3.4.0
 Summary: A simple yet powerful CloudStack API client for Python and the command-line.
 Home-page: https://github.com/ngine-io/cs
 Author: Bruno Renié
@@ -10,11 +10,11 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: requests
@@ -22,17 +22,25 @@ Provides-Extra: async
 Requires-Dist: aiohttp; extra == "async"
 Provides-Extra: highlight
 Requires-Dist: pygments; extra == "highlight"
+Dynamic: license-file
 
-CS
-==
+.. image:: https://github.com/ngine-io/cs/actions/workflows/main.yml/badge.svg
+   :alt: CI
+   :target: https://github.com/ngine-io/cs/actions/workflows/main.yml
+.. image:: https://img.shields.io/pypi/pyversions/cs.svg
+   :alt: Python versions
+   :target: https://pypi.org/project/cs/
+
+.. image:: https://img.shields.io/pypi/dw/cs.svg
+   :alt: Downloads / Week
+   :target: https://pypi.org/project/cs/
 
 .. image:: https://img.shields.io/pypi/l/cs.svg
    :alt: License
    :target: https://pypi.org/project/cs/
 
-.. image:: https://img.shields.io/pypi/pyversions/cs.svg
-   :alt: Python versions
-   :target: https://pypi.org/project/cs/
+CS - Python CloudStack API client 
+=================================
 
 A simple, yet powerful CloudStack API client for python and the command-line.
 

{cs-3.3.0 → cs-3.4.0}/cs.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ cs/__init__.py
 cs/__main__.py
 cs/_async.py
 cs/client.py
+cs/version.py
 cs.egg-info/PKG-INFO
 cs.egg-info/SOURCES.txt
 cs.egg-info/dependency_links.txt

{cs-3.3.0 → cs-3.4.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cs
-version = 3.3.0
+version = 3.4.0
 url = https://github.com/ngine-io/cs
 author = Bruno Renié
 description = A simple yet powerful CloudStack API client for Python and the command-line.
@@ -13,11 +13,11 @@ classifiers =
 	License :: OSI Approved :: BSD License
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
 
 [options]
 packages = find:
@@ -26,13 +26,6 @@ zip_safe = false
 install_requires = 
 	pytz
 	requests
-setup_requires = 
-	pytest-runner
-tests_require = 
-	aiohttp
-	pytest-cache
-	pytest-cov
-	pytest
 
 [options.packages.find]
 exclude = tests