From 8e1a34384763b03ab6774a6fa9c8e978f12d8903 Mon Sep 17 00:00:00 2001
From: Christine Banek <cbanek@gmail.com>
Date: Sat, 2 Dec 2023 00:27:06 +0000
Subject: [PATCH] [DM-41830] Fix up linter and ordering issuse

---
 src/lsst/rsp/__init__.py | 16 +++++++++-------
 src/lsst/rsp/catalog.py  |  2 --
 src/lsst/rsp/service.py  | 11 ++++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/lsst/rsp/__init__.py b/src/lsst/rsp/__init__.py
index 86ed6d1..7227192 100644
--- a/src/lsst/rsp/__init__.py
+++ b/src/lsst/rsp/__init__.py
@@ -36,19 +36,21 @@
 
 __all__ = [
     "__version__",
-    "Forwarder",
+    "get_catalog",
+    "get_obstap_service",
+    "get_tap_service",
+    "retrieve_query",
     "IPythonHandler",
-    "format_bytes",
     "forward_lsst_log",
+    "Forwarder",
+    "get_datalink_result",
+    "get_siav2_service",
+    "format_bytes",
     "get_access_token",
-    "get_catalog",
     "get_digest",
+    "get_hostname",
     "get_node",
     "get_pod",
-    "get_tap_service",
-    "get_obstap_service",
-    "retrieve_query",
-    "get_hostname",
     "get_pyvo_auth",
     "show_with_bokeh_server",
 ]
diff --git a/src/lsst/rsp/catalog.py b/src/lsst/rsp/catalog.py
index eaddd97..6e11b8c 100644
--- a/src/lsst/rsp/catalog.py
+++ b/src/lsst/rsp/catalog.py
@@ -1,6 +1,4 @@
-import os
 import warnings
-from typing import Optional
 
 import pyvo
 from deprecated import deprecated
diff --git a/src/lsst/rsp/service.py b/src/lsst/rsp/service.py
index 9e57e19..132aa57 100644
--- a/src/lsst/rsp/service.py
+++ b/src/lsst/rsp/service.py
@@ -1,6 +1,5 @@
 import os
 
-import pyvo
 from pyvo.dal import SIA2Service
 from pyvo.dal.adhoc import DatalinkResults
 
@@ -8,19 +7,21 @@
 
 LSST_CLOUD = [
     "https://data.lsst.cloud",
-    "https://data-int.lsst.cloud", 
-    "https://data-dev.lsst.cloud"
+    "https://data-int.lsst.cloud",
+    "https://data-dev.lsst.cloud",
 ]
 
 USDF = [
     "https://usdf-rsp.slac.stanford.edu",
-    "https://usdf-rsp-dev.slac.stanford.edu"
+    "https://usdf-rsp-dev.slac.stanford.edu",
 ]
 
 
 def get_datalink_result(result) -> DatalinkResults:
     """Helper function to return the datalink part of the result."""
-    return DatalinkResults.from_result_url(result.getdataurl(),session=get_pyvo_auth())
+    return DatalinkResults.from_result_url(
+        result.getdataurl(), session=get_pyvo_auth()
+    )
 
 
 def get_siav2_service(*args: str) -> SIA2Service: