Home Original page

Accept suggestions from new toolchain · rec/backer@98af28a

19 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -1 +0,0 @@

1-
Original file line numberDiff line numberDiff line change

@@ -1,8 +1,10 @@

1+

import time

2+
3+

import yaml

4+
15

from . import config, signal_handler, stoppable_thread

26

from .execute import Execute

37

from .task import task_class

4-

import time

5-

import yaml

68
79
810

class MainThread(stoppable_thread.StoppableThread):

Original file line numberDiff line numberDiff line change

@@ -6,14 +6,15 @@

66

configure the program, otherwise stdin is read.

77

"""

88
9-

from . import describe

10-

from . import task as _task

11-

from . import variables

12-

from pathlib import Path

139

import argparse

1410

import os

11+

from pathlib import Path

12+
1513

import yaml

1614
15+

from . import describe, variables

16+

from . import task as _task

17+
1718

STEM = Path("backer")

1819

SUFFIXES = ".yml", ".yaml", ".json"

1920
Original file line numberDiff line numberDiff line change

@@ -1,8 +1,10 @@

1-

from .stoppable_thread import Stoppable, StoppableThreadList

2-

from watchdog import observers

1+

import time

2+
33

import run_subprocess as rs

44

import schedule as _schedule

5-

import time

5+

from watchdog import observers

6+
7+

from .stoppable_thread import Stoppable, StoppableThreadList

68
79
810

class Execute(StoppableThreadList):

Original file line numberDiff line numberDiff line change

@@ -35,7 +35,7 @@ def set_all(handler):

3535
3636

running = all(s in restarts for s in signals)

3737

msg = "restarting" if running else "stopping"

38-

print("Received signal %s: %s" % (" ".join(signals), msg))

38+

print("Received signal {}: {}".format(" ".join(signals), msg))

3939

signals.clear()

4040

if not running:

4141

return

Original file line numberDiff line numberDiff line change

@@ -3,7 +3,7 @@

33
44

def task_class(name):

55

if "." not in name:

6-

name = "%s.%s" % (__package__, name)

6+

name = f"{__package__}.{name}"

77
88

mod = importlib.import_module(name)

99

r = name.split(".")[-1].lower()

Original file line numberDiff line numberDiff line change

@@ -1,4 +1,4 @@

1-

from ._scheduled import dataclass, ScheduledCommandTask

1+

from ._scheduled import ScheduledCommandTask, dataclass

22
33
44

@dataclass

Original file line numberDiff line numberDiff line change

@@ -1,6 +1,7 @@

1-

from ._task import dataclass, Task

21

from pathlib import Path

32
3+

from ._task import Task, dataclass

4+
45
56

@dataclass

67

class ScheduledCommandTask(Task):

@@ -38,7 +39,7 @@ def add(self, *args, **kwds):

3839

flag = flag.replace("_", "-")

3940

flag = ("-" if len(flag) == 1 else "--") + flag

4041

if value is not True:

41-

flag = "%s=%s" % (flag, value)

42+

flag = f"{flag}={value}"

4243

self.add(flag)

4344
4445

__dataclass_docs__ = """

Original file line numberDiff line numberDiff line change

@@ -1,5 +1,5 @@

1-

from dataclasses import dataclass

21

import shlex

2+

from dataclasses import dataclass

33
44
55

@dataclass

Original file line numberDiff line numberDiff line change

@@ -1,12 +1,13 @@

1-

from ._task import Task

2-

from dataclasses import dataclass

3-

from pathlib import Path

4-

from queue import Queue, Empty

51

import datetime

62

import functools

73

import os

84

import sys

95

import time

6+

from dataclasses import dataclass

7+

from pathlib import Path

8+

from queue import Empty, Queue

9+
10+

from ._task import Task

1011
1112

# How long before timing out the service queue?

1213

QUEUE_TIMEOUT = 1