Merge pull request #113 from deathiop/pytest

test: full migration to pytest

Author: rbeuque74

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022, OVH SAS.
+Copyright (c) 2013-2023, OVH SAS.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.rst

@@ -26,8 +26,6 @@ credential creation and requests signing.
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  # Instantiate. Visit https://api.ovh.com/createToken/?GET=/me
@@ -133,7 +131,6 @@ customer's information:
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
  import ovh
 
  # create a client using configuration
@@ -179,8 +176,6 @@ is only supported with reserved keywords.
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  DOMAIN = "example.com"
@@ -210,8 +205,6 @@ This example assumes an existing Configuration_ with valid ``application_key``,
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  # create a client
@@ -240,8 +233,6 @@ This example assumes an existing Configuration_ with valid ``application_key``,
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  # create a client
@@ -271,8 +262,6 @@ This example assumes an existing Configuration_ with valid ``application_key``,
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
  from tabulate import tabulate
 
@@ -318,7 +307,6 @@ fully installed on the machine and a consumer key allowed on the server exists.
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
  import ovh
  import sys
  import time
@@ -451,8 +439,6 @@ With characters invalid in python argument name like a dot, you can:
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  params = {}

debian/copyright

@@ -3,12 +3,12 @@ Upstream-Name: python-ovh
 Source: https://github.com/ovh/python-ovh
 
 Files: *
-Copyright: 2013-2018 OVH SAS
+Copyright: 2013-2023 OVH SAS
 License: 3-clause BSD
  See LICENSE
 
 
 Files: debian/*
-Copyright: 2013-2018 OVH SAS
+Copyright: 2013-2023 OVH SAS
 License: 3-clause BSD
  See LICENSE

docs/index.rst

@@ -11,8 +11,6 @@ creation and requests signing.
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  # Instantiate. Visit https://api.ovh.com/createToken/index.cgi?GET=/me
@@ -110,8 +108,6 @@ behalf, you need a **consumer key (CK)**.
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  try:
  input = raw_input
  except NameError:
@@ -167,8 +163,6 @@ is only supported with reserved keywords.
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  DOMAIN = "example.com"
@@ -198,8 +192,6 @@ This example assumes an existing Configuration_ with valid ``application_key``,
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  # create a client without a consumerKey
@@ -228,8 +220,6 @@ This example assumes an existing Configuration_ with valid ``application_key``,
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  # create a client
@@ -259,8 +249,6 @@ This example assumes an existing Configuration_ with valid ``application_key``,
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
  from tabulate import tabulate
 
@@ -343,8 +331,6 @@ With characters invalid in python argument name like a dot, you can:
 
 .. code:: python
 
- # -*- encoding: utf-8 -*-
-
  import ovh
 
  params = {}

examples/serviceExpiration/serviceThatWillExpired.py

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 import datetime
 
 from tabulate import tabulate

examples/serviceList/serviceList.py

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 import datetime
 
 from tabulate import tabulate

ovh/__init__.py

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2013-2018, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

ovh/client.py

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2013-2018, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,17 +36,12 @@
 import json
 import keyword
 import time
-
-try:
- from urllib import urlencode
-except ImportError: # pragma: no cover
- # Python 3
- from urllib.parse import urlencode
+from urllib.parse import urlencode
 
 from requests import Session
 from requests.exceptions import RequestException
 
-from .config import config
+from . import config
 from .consumer_key import ConsumerKeyRequest
 from .exceptions import (
  APIError,
@@ -82,7 +75,7 @@
 TIMEOUT = 180
 
 
-class Client(object):
+class Client:
  """
  Low level OVH Client. It abstracts all the authentication and request
  signing logic along with some nice tools helping with key generation.
@@ -152,13 +145,16 @@ def __init__(
  :param float timeout: Same timeout for both connection and read
  :raises InvalidRegion: if ``endpoint`` can't be found in ``ENDPOINTS``.
  """
+
+ configuration = config.ConfigurationManager()
+
  # Load a custom config file if requested
  if config_file is not None:
- config.read(config_file)
+ configuration.read(config_file)
 
  # load endpoint
  if endpoint is None:
- endpoint = config.get("default", "endpoint")
+ endpoint = configuration.get("default", "endpoint")
 
  try:
  self._endpoint = ENDPOINTS[endpoint]
@@ -167,15 +163,15 @@ def __init__(
 
  # load keys
  if application_key is None:
- application_key = config.get(endpoint, "application_key")
+ application_key = configuration.get(endpoint, "application_key")
  self._application_key = application_key
 
  if application_secret is None:
- application_secret = config.get(endpoint, "application_secret")
+ application_secret = configuration.get(endpoint, "application_secret")
  self._application_secret = application_secret
 
  if consumer_key is None:
- consumer_key = config.get(endpoint, "consumer_key")
+ consumer_key = configuration.get(endpoint, "consumer_key")
  self._consumer_key = consumer_key
 
  # lazy load time delta
@@ -510,7 +506,7 @@ def raw_call(self, method, path, data=None, need_auth=True, headers=None):
  # include payload
  if data is not None:
  headers["Content-type"] = "application/json"
- body = json.dumps(data)
+ body = json.dumps(data, separators=(",", ":")) # Separators to prevent adding useless spaces
 
  # sign request. Never sign 'time' or will recurse infinitely
  if need_auth:

ovh/config.py

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2013-2018, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -62,14 +60,9 @@
 project or user.
 """
 
+from configparser import NoOptionError, NoSectionError, RawConfigParser
 import os
 
-try:
- from ConfigParser import NoOptionError, NoSectionError, RawConfigParser
-except ImportError: # pragma: no cover
- # Python 3
- from configparser import NoOptionError, NoSectionError, RawConfigParser
-
 __all__ = ["config"]
 
 #: Locations where to look for configuration file by *increasing* priority
@@ -80,7 +73,7 @@
 ]
 
 
-class ConfigurationManager(object):
+class ConfigurationManager:
  """
  Application wide configuration manager
  """

ovh/consumer_key.py

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright (c) 2013-2018, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without