cleanup

scilog/authclient.py

@@ -44,3 +44,8 @@ class AuthClient:
 
 
 
+class AuthError(Exception):
+    pass
+
+
+

scilog/autherror.py

@@ -1,5 +0,0 @@
-
-class AuthError(Exception):
-    pass
-
-

scilog/scicat.py

@@ -1,16 +1,9 @@
-from .authclient import AuthClient, AUTH_HEADERS
+from .authclient import AuthClient, AuthError, AUTH_HEADERS
-from .autherror import AuthError
 from .utils import post_request, get_request
 
 
 class SciCat(AuthClient):
 
-    @property
-    def proposals(self):
-        url = self.address + "/proposals"
-        headers = self.auth_headers
-        return get_request(url, headers=headers)
-
     def authenticate(self, username, password):
         url = self.address + "/users/login"
         auth_payload = {
@@ -26,6 +19,13 @@ class SciCat(AuthClient):
             return token
 
 
+    @property
+    def proposals(self):
+        url = self.address + "/proposals"
+        headers = self.auth_headers
+        return get_request(url, headers=headers)
+
+
 
 class SciCatAuthError(AuthError):
     pass

scilog/scilog.py

@@ -1,24 +1,10 @@
-from .authclient import AuthClient, AUTH_HEADERS
+from .authclient import AuthClient, AuthError, AUTH_HEADERS
-from .autherror import AuthError
 from .utils import post_request, get_request
 from .mkfilt import make_filter
 
 
 class SciLog(AuthClient):
 
-    def get_snippets(self, **kwargs):
-        url = self.address + "/basesnippets"
-        params = make_filter(**kwargs)
-        headers = self.auth_headers
-        return get_request(url, params=params, headers=headers)
-
-    def post_snippet(self, **kwargs):
-        url = self.address + "/basesnippets"
-        payload = kwargs
-        headers = self.auth_headers
-        return post_request(url, payload=payload, headers=headers)
-
-
     def authenticate(self, username, password):
         url = self.address + "/users/login"
         auth_payload = {
@@ -34,6 +20,19 @@ class SciLog(AuthClient):
             return token
 
 
+    def get_snippets(self, **kwargs):
+        url = self.address + "/basesnippets"
+        params = make_filter(**kwargs)
+        headers = self.auth_headers
+        return get_request(url, params=params, headers=headers)
+
+    def post_snippet(self, **kwargs):
+        url = self.address + "/basesnippets"
+        payload = kwargs
+        headers = self.auth_headers
+        return post_request(url, payload=payload, headers=headers)
+
+
 
 class SciLogAuthError(AuthError):
     pass