From d0deb73522af7e8599007c398b0c18cbc79b2533 Mon Sep 17 00:00:00 2001 From: NichtJens Date: Tue, 1 Jun 2021 09:12:25 +0200 Subject: [PATCH] import order and spaces --- scilog/httpclient.py | 6 +++--- scilog/scilog.py | 7 +++++-- scilog/snippet.py | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scilog/httpclient.py b/scilog/httpclient.py index 67f3a92..92b0206 100644 --- a/scilog/httpclient.py +++ b/scilog/httpclient.py @@ -2,9 +2,9 @@ import requests import functools import json from abc import ABC, abstractmethod - from .authmixin import AuthMixin, AuthError, HEADER_JSON + def authenticated(func): @functools.wraps(func) def authenticated_call(*args, **kwargs): @@ -15,11 +15,12 @@ def authenticated(func): else: kwargs["headers"] = {} kwargs["headers"]["Authorization"] = args[0].token - return func(*args, **kwargs) return authenticated_call + class HttpClient(AuthMixin): + def __init__(self, address): self.address = address self._verify_certificate = True @@ -48,7 +49,6 @@ class HttpClient(AuthMixin): self.config.delete() raise response.raise_for_status() - @authenticated def post_request(self, url, payload=None, headers=None, timeout=10): response = requests.post(url, json=payload, headers=headers, timeout=timeout, verify=self._verify_certificate).json() diff --git a/scilog/scilog.py b/scilog/scilog.py index 1d76bdb..1cc7e53 100644 --- a/scilog/scilog.py +++ b/scilog/scilog.py @@ -1,10 +1,12 @@ from __future__ import annotations +import functools +from typing import TypeVar, Union, List, Type, get_type_hints + from .authmixin import AuthMixin, AuthError, HEADER_JSON from .httpclient import HttpClient from .snippet import Snippet, Basesnippet, Paragraph -from typing import TypeVar, Union, List, Type, get_type_hints -import functools + def pinned_to_logbook(logbook_keys): def pinned_to_logbook_inner(func): @@ -23,6 +25,7 @@ def pinned_to_logbook(logbook_keys): return pinned_to_logbook_call return pinned_to_logbook_inner + class SciLogRestAPI(HttpClient): def __init__(self, url): super().__init__(url) diff --git a/scilog/snippet.py b/scilog/snippet.py index 712d437..53b619b 100644 --- a/scilog/snippet.py +++ b/scilog/snippet.py @@ -28,7 +28,6 @@ def property_maker(cls, name, type_name): return prop - class Snippet: def __init__(self, **kwargs): @@ -96,7 +95,6 @@ class Basesnippet(Snippet): self.snippetType = "basesnippet" - class Paragraph(Basesnippet): def __init__(self): super().__init__()