pybind/mgr/snap_schedule: add type hint for mypy, fix import

Signed-off-by: Jan Fajerski <jfajerski@suse.com>

diff --git a/src/pybind/mgr/snap_schedule/__init__.py b/src/pybind/mgr/snap_schedule/__init__.py
index f2d056fedeb56a7b664d77176be1a1a531f3bb1c..34b7ffbb037e7dd321c7d358f872139b66cd431a 100644 (file)
--- a/src/pybind/mgr/snap_schedule/__init__.py
+++ b/src/pybind/mgr/snap_schedule/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import os
+from os import environ
 
-if 'UNITTEST' in os.environ:
+if 'UNITTEST' in environ:
     import tests
 
 from .module import Module

diff --git a/src/pybind/mgr/snap_schedule/fs/schedule.py b/src/pybind/mgr/snap_schedule/fs/schedule.py
index c919316af24fdc5e76a2b6404c9920f956f53a62..59fec351a6550daef0b8089e013fc431fe6542bb 100644 (file)
--- a/src/pybind/mgr/snap_schedule/fs/schedule.py
+++ b/src/pybind/mgr/snap_schedule/fs/schedule.py
@@ -8,6 +8,7 @@ import json
 import logging
 import re
 import sqlite3
+from typing import Tuple, Any
 
 log = logging.getLogger(__name__)
 
@@ -24,8 +25,10 @@ def parse_retention(retention):
     log.debug(f'parse_retention({retention}) -> {ret}')
     return ret
 
+
 RETENTION_MULTIPLIERS = ['n', 'M', 'h', 'd', 'w', 'm', 'y']
 
+
 def dump_retention(retention):
     ret = ''
     for mult in RETENTION_MULTIPLIERS:
@@ -33,6 +36,7 @@ def dump_retention(retention):
             ret += str(retention[mult]) + mult
     return ret
 
+
 class Schedule(object):
     '''
     Wrapper to work with schedules stored in sqlite
@@ -161,7 +165,7 @@ class Schedule(object):
     @classmethod
     def get_db_schedules(cls, path, db, fs, repeat=None, start=None):
         query = cls.GET_SCHEDULES
-        data = (path,)
+        data: Tuple[Any, ...] = (path,)
         if repeat:
             query += ' AND sm.repeat = ?'
             data += (repeat,)

diff --git a/src/pybind/mgr/snap_schedule/tests/conftest.py b/src/pybind/mgr/snap_schedule/tests/conftest.py
index 727d723f3dd906b20eda99a42f866fa1f486f20c..35255b8d486b0c10767a53d550a582207161adfc 100644 (file)
--- a/src/pybind/mgr/snap_schedule/tests/conftest.py
+++ b/src/pybind/mgr/snap_schedule/tests/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 import sqlite3
-from fs.schedule import Schedule
+from ..fs.schedule import Schedule
 
 
 # simple_schedule fixture returns schedules without any timing arguments