Use new style imports

yamcs · Sep 23, 2024 · 7242ea2 · 7242ea2
1 parent f6c1328
commit 7242ea2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/src/yamcs/cli/__main__.py b/src/yamcs/cli/__main__.py
@@ -4,7 +4,7 @@
 
 import argcomplete
 import pkg_resources
-from yamcs.core.exceptions import Unauthorized
+from yamcs.client import Unauthorized
 
 from yamcs.cli import utils
 from yamcs.cli.alarms import AlarmsCommand

diff --git a/src/yamcs/cli/dbshell.py b/src/yamcs/cli/dbshell.py
@@ -10,8 +10,7 @@
 from typing import Any, List
 
 from google.protobuf import json_format
-from yamcs.client import YamcsClient
-from yamcs.core.exceptions import YamcsError
+from yamcs.client import YamcsClient, YamcsError
 from yamcs.protobuf.events import events_pb2
 
 from yamcs.cli import utils

diff --git a/src/yamcs/cli/login.py b/src/yamcs/cli/login.py
@@ -2,8 +2,7 @@
 from getpass import getpass
 from typing import Optional
 
-from yamcs.client import YamcsClient
-from yamcs.core import auth
+from yamcs.client import Credentials, YamcsClient
 
 from yamcs.cli import utils
 from yamcs.cli.utils import eprint
@@ -112,7 +111,7 @@ def read_credentials(self, username=None):
             eprint("*** Password may not be empty")
             return False
 
-        return auth.Credentials(username=username, password=password)
+        return Credentials(username=username, password=password)
 
     def save_client_config(
         self,

diff --git a/src/yamcs/cli/storage.py b/src/yamcs/cli/storage.py
@@ -4,8 +4,7 @@
 import tempfile
 from typing import Any, List
 
-from yamcs.client import YamcsClient
-from yamcs.core.helpers import to_isostring
+from yamcs.client import YamcsClient, to_isostring
 
 from yamcs.cli import utils
 from yamcs.cli.completers import BucketCompleter, BucketOrObjectCompleter

diff --git a/src/yamcs/cli/utils.py b/src/yamcs/cli/utils.py
@@ -8,8 +8,7 @@
 
 import pkg_resources
 from dateutil import parser
-from yamcs.core import auth
-from yamcs.core.helpers import parse_server_timestring, to_isostring
+from yamcs.client import Credentials, parse_server_timestring, to_isostring
 
 from yamcs.cli.exceptions import NoInstanceError, NoServerError
 
@@ -65,7 +64,7 @@ def read_credentials():
             access_token = d["access_token"]
             refresh_token = d["refresh_token"]
             expiry = parse_server_timestring(d["expiry"]) if "expiry" in d else None
-            return auth.Credentials(
+            return Credentials(
                 access_token=access_token,
                 refresh_token=refresh_token,
                 expiry=expiry,