Format source with black

Author: einarf

cachetclient/__init__.py

@@ -1,3 +1,3 @@
 from cachetclient.client import Client # noqa
 
-___version__ = '4.0.0'
+___version__ = "4.0.0"

cachetclient/base.py

@@ -6,6 +6,7 @@
 
 class Resource:
  """Bag of attributes"""
+
  def __init__(self, manager, data):
  """Resource initializer.
 
@@ -47,11 +48,11 @@ def update(self):
  Returns:
  The updated resource from the server
  """
- return self._manager.update(self.get('id'), **self.attrs)
+ return self._manager.update(self.get("id"), **self.attrs)
 
  def delete(self) -> None:
  """Deletes the resource from the server"""
- self._manager.delete(self.get('id'))
+ self._manager.delete(self.get("id"))
 
  def __repr__(self) -> str:
  return str(self)
@@ -64,6 +65,7 @@ class Manager:
  """
  Base class for handling crud resources
  """
+
  resource_class = Resource
  path = None # Type: str
 
@@ -76,10 +78,12 @@ def __init__(self, http_client: HttpClient):
  self._http = http_client
 
  if self.resource_class is None:
- raise ValueError('resource_class not defined in class {}'.format(self.__class__))
+ raise ValueError(
+ "resource_class not defined in class {}".format(self.__class__)
+ )
 
  if self.path is None:
- raise ValueError('path not defined for class {}'.format(self.__class__))
+ raise ValueError("path not defined for class {}".format(self.__class__))
 
  def instance_from_dict(self, data: dict) -> Resource:
  """Creates a resource instance from a dictionary.
@@ -128,13 +132,15 @@ def instance_list_from_json(self, data: str) -> List[Resource]:
  """
  instances = json.loads(data)
  if not isinstance(instances, list):
- raise ValueError("json data is {}, not a list : {}".format(type(instances), instances))
+ raise ValueError(
+ "json data is {}, not a list : {}".format(type(instances), instances)
+ )
 
  return [self.resource_class(self, inst) for inst in instances]
 
  def _create(self, path: str, data: dict):
  response = self._http.post(path, data=data)
- return self.resource_class(self, response.json()['data'])
+ return self.resource_class(self, response.json()["data"])
 
  def _update(self, path: str, resource_id: int, data: dict) -> Resource:
  """Generic resource updater
@@ -148,9 +154,11 @@ def _update(self, path: str, resource_id: int, data: dict) -> Resource:
  Resource: The updated resource from the server
  """
  response = self._http.put("{}/{}".format(path, resource_id), data=data)
- return self.resource_class(self, response.json()['data'])
+ return self.resource_class(self, response.json()["data"])
 
- def _list_paginated(self, path: str, page=1, per_page=20) -> Generator[Resource, None, None]:
+ def _list_paginated(
+ self, path: str, page=1, per_page=20
+ ) -> Generator[Resource, None, None]:
  """List resources paginated.
 
  Args:
@@ -167,19 +175,19 @@ def _list_paginated(self, path: str, page=1, per_page=20) -> Generator[Resource,
  result = self._http.get(
  path,
  params={
- 'page': page,
- 'per_page': per_page,
+ "page": page,
+ "per_page": per_page,
  },
  )
  json_data = result.json()
 
- meta = json_data['meta']
- data = json_data['data']
+ meta = json_data["meta"]
+ data = json_data["data"]
 
  for entry in data:
  yield self.resource_class(self, entry)
 
- if page >= meta['pagination']['total_pages']:
+ if page >= meta["pagination"]["total_pages"]:
  break
 
  page += 1
@@ -201,7 +209,7 @@ def _get(self, path: str, resource_id: int):
  """
  result = self._http.get("{}/{}".format(path, resource_id))
  json_data = result.json()
- return self.resource_class(self, json_data['data'])
+ return self.resource_class(self, json_data["data"])
 
  def _count(self, path: str) -> int:
  """Generic count method
@@ -213,9 +221,9 @@ def _count(self, path: str) -> int:
  Returns:
  int: Number of resources
  """
- result = self._http.get(path, params={'per_page': 1})
+ result = self._http.get(path, params={"per_page": 1})
  json_data = result.json()
- return json_data['meta']['pagination']['total']
+ return json_data["meta"]["pagination"]["total"]
 
  def _delete(self, path: str, resource_id: int) -> None:
  """Generic resource deleter

cachetclient/client.py

@@ -5,10 +5,11 @@
 
 
 def Client(
- endpoint: str = None,
- api_token: str = None,
- version: str = None,
- verify_tls: bool = True) -> v1.Client:
+ endpoint: str = None,
+ api_token: str = None,
+ version: str = None,
+ verify_tls: bool = True,
+) -> v1.Client:
  """
  Creates a cachet client. Use this fuction to create clients to ensure
  compatibility in the future.
@@ -22,7 +23,7 @@ def Client(
  verify_tls (bool): Enable/disable tls verify. When using self signed certificates this has to be ``False``.
  """
  if not api_token:
- api_token = os.environ.get('CACHET_API_TOKEN')
+ api_token = os.environ.get("CACHET_API_TOKEN")
 
  if not api_token:
  raise ValueError(
@@ -32,7 +33,7 @@ def Client(
  )
 
  if not endpoint:
- endpoint = os.environ.get('CACHET_ENDPOINT')
+ endpoint = os.environ.get("CACHET_ENDPOINT")
 
  if not endpoint:
  raise ValueError(
@@ -52,8 +53,8 @@ def detect_version(endpoint: str) -> str:
  Detect the api version from endpoint url.
  Currently cachet only has a single "v1" endpoint but this may change in the future.
  """
- if endpoint.endswith('/v1'):
- return '1'
+ if endpoint.endswith("/v1"):
+ return "1"
 
  raise ValueError(
  "Cannot determine api version based on endpoint '{}'. "

cachetclient/httpclient.py

@@ -7,40 +7,43 @@
 
 
 class HttpClient:
-
  def __init__(
- self, base_url: str,
- api_token: str,
- timeout: float = None,
- verify_tls: bool = True,
- user_agent: str = None):
+ self,
+ base_url: str,
+ api_token: str,
+ timeout: float = None,
+ verify_tls: bool = True,
+ user_agent: str = None,
+ ):
 
  self.base_url = base_url
- if not self.base_url.endswith('/'):
- self.base_url += '/'
+ if not self.base_url.endswith("/"):
+ self.base_url += "/"
  self.verify_tls = verify_tls
  self.timeout = timeout
  self.user_agent = user_agent
 
  self._session = requests.Session()
- self._session.headers.update({
- 'X-Cachet-Token': api_token,
- 'User-Agent': user_agent,
- 'Accept': 'application/json',
- 'Content-Type': 'application/json',
- })
+ self._session.headers.update(
+ {
+ "X-Cachet-Token": api_token,
+ "User-Agent": user_agent,
+ "Accept": "application/json",
+ "Content-Type": "application/json",
+ }
+ )
 
  def get(self, path, params=None) -> requests.Response:
- return self.request('GET', path, params=params)
+ return self.request("GET", path, params=params)
 
  def post(self, path, data) -> requests.Response:
- return self.request('POST', path, data=data)
+ return self.request("POST", path, data=data)
 
  def put(self, path, data) -> requests.Response:
- return self.request('PUT', path, data=data)
+ return self.request("PUT", path, data=data)
 
  def delete(self, path, resource_id) -> requests.Response:
- return self.request('DELETE', "{}/{}".format(path, resource_id))
+ return self.request("DELETE", "{}/{}".format(path, resource_id))
 
  def request(self, method, path, params=None, data=None) -> requests.Response:
  url = urljoin(self.base_url, path)
@@ -52,7 +55,7 @@ def request(self, method, path, params=None, data=None) -> requests.Response:
  verify=self.verify_tls,
  timeout=self.timeout,
  )
- logger.debug('%s %s', method, response.url)
+ logger.debug("%s %s", method, response.url)
  if response.ok:
  return response
 

cachetclient/utils.py

@@ -20,14 +20,14 @@ def to_datetime(timestamp: str):
 
  try:
  # '2019-05-24 09:26:22'
- return datetime.strptime(timestamp, '%Y-%m-%d %H:%M:%S')
+ return datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S")
  except ValueError:
  pass
 
  try:
  # 'Friday 1st May 2019 10:01:44'. Used in verified_at for subscribers
  sub_timestamp = re.sub(r"\b([0123]?[0-9])(st|th|nd|rd)\b", r"\1", timestamp)
- return datetime.strptime(sub_timestamp, '%A %d %B %Y %H:%M:%S')
+ return datetime.strptime(sub_timestamp, "%A %d %B %Y %H:%M:%S")
  except ValueError:
  pass
 

cachetclient/v1/client.py

@@ -12,7 +12,6 @@
 
 
 class Client:
-
  def __init__(self, http_client: HttpClient):
  """
  Args: