move nanorst module to borg.helpers

src/borg/archiver/common.py

@@ -9,11 +9,11 @@ from ..constants import *  # NOQA
 from ..cache import Cache, assert_secure
 from ..helpers import Error
 from ..helpers import GlobSpec, SortBySpec, positive_int_validator, location_validator, Location
+from ..helpers.nanorst import rst_to_terminal
 from ..manifest import Manifest, AI_HUMAN_SORT_KEYS
 from ..patterns import PatternMatcher
 from ..remote import RemoteRepository
 from ..repository import Repository
-from ..nanorst import rst_to_terminal
 from ..patterns import (
     ArgparsePatternAction,
     ArgparseExcludeFileAction,

src/borg/archiver/help.py

@@ -3,7 +3,7 @@ import functools
 import textwrap
 
 from ..constants import *  # NOQA
-from ..nanorst import rst_to_terminal
+from ..helpers.nanorst import rst_to_terminal
 
 
 class HelpMixIn:

src/borg/nanorst.py → src/borg/helpers/nanorst.py

@@ -1,7 +1,7 @@
 import io
 import sys
 
-from .helpers import is_terminal
+from . import is_terminal
 
 
 class TextPecker:

src/borg/testsuite/archiver.py

@@ -29,7 +29,7 @@ import borg.helpers.errors
 from .. import xattr, helpers, platform
 from ..archive import Archive, ChunkBuffer
 from ..archiver import Archiver, PURE_PYTHON_MSGPACK_WARNING
-from ..archiver.common import build_filter, build_matcher
+from ..archiver.common import build_filter
 from ..cache import Cache, LocalCache
 from ..chunker import has_seek_hole
 from ..constants import *  # NOQA
@@ -42,10 +42,10 @@ from ..helpers import bin_to_hex
 from ..helpers import msgpack
 from ..helpers import parse_storage_quota
 from ..helpers import flags_noatime, flags_normal
+from ..helpers.nanorst import RstToTextLazy, rst_to_terminal
 from ..manifest import Manifest, MandatoryFeatureUnsupported
-from ..nanorst import RstToTextLazy, rst_to_terminal
 from ..patterns import IECommand, PatternMatcher, parse_pattern
-from ..item import Item, ItemDiff, chunks_contents_equal
+from ..item import Item, chunks_contents_equal
 from ..locking import LockFailed
 from ..logger import setup_logging
 from ..remote import RemoteRepository, PathNotAllowed

src/borg/testsuite/nanorst.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ..nanorst import rst_to_text
+from ..helpers.nanorst import rst_to_text
 
 
 def test_inline():