diff --git a/archivebox/cli/__init__.py b/archivebox/cli/__init__.py index ed050bfc..70a6866e 100644 --- a/archivebox/cli/__init__.py +++ b/archivebox/cli/__init__.py @@ -110,7 +110,7 @@ def main(args: Optional[List[str]]=NotProvided, stdin: Optional[IO]=NotProvided, command.subcommand = 'version' if command.subcommand not in ('help', 'version', 'status'): - from ..logging import log_cli_command + from ..logging_util import log_cli_command log_cli_command( subcommand=command.subcommand, diff --git a/archivebox/cli/archivebox_add.py b/archivebox/cli/archivebox_add.py index 5fda755b..de6c3dbc 100644 --- a/archivebox/cli/archivebox_add.py +++ b/archivebox/cli/archivebox_add.py @@ -10,7 +10,7 @@ from typing import List, Optional, IO from ..main import add, docstring from ..config import OUTPUT_DIR, ONLY_NEW -from ..logging import SmartFormatter, accept_stdin, stderr +from ..logging_util import SmartFormatter, accept_stdin, stderr @docstring(add.__doc__) diff --git a/archivebox/cli/archivebox_config.py b/archivebox/cli/archivebox_config.py index dd422413..7dffbfad 100644 --- a/archivebox/cli/archivebox_config.py +++ b/archivebox/cli/archivebox_config.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import config, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, accept_stdin +from ..logging_util import SmartFormatter, accept_stdin @docstring(config.__doc__) diff --git a/archivebox/cli/archivebox_help.py b/archivebox/cli/archivebox_help.py index b20667be..0b245a03 100755 --- a/archivebox/cli/archivebox_help.py +++ b/archivebox/cli/archivebox_help.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import help, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(help.__doc__) diff --git a/archivebox/cli/archivebox_init.py b/archivebox/cli/archivebox_init.py index 8a507cc7..e27b26d9 100755 --- a/archivebox/cli/archivebox_init.py +++ b/archivebox/cli/archivebox_init.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import init, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(init.__doc__) diff --git a/archivebox/cli/archivebox_list.py b/archivebox/cli/archivebox_list.py index c75519bf..2f2180b0 100644 --- a/archivebox/cli/archivebox_list.py +++ b/archivebox/cli/archivebox_list.py @@ -22,7 +22,7 @@ from ..index import ( get_corrupted_folders, get_unrecognized_folders, ) -from ..logging import SmartFormatter, accept_stdin +from ..logging_util import SmartFormatter, accept_stdin @docstring(list_all.__doc__) diff --git a/archivebox/cli/archivebox_remove.py b/archivebox/cli/archivebox_remove.py index 18e5915a..36779e87 100644 --- a/archivebox/cli/archivebox_remove.py +++ b/archivebox/cli/archivebox_remove.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import remove, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, accept_stdin +from ..logging_util import SmartFormatter, accept_stdin @docstring(remove.__doc__) diff --git a/archivebox/cli/archivebox_schedule.py b/archivebox/cli/archivebox_schedule.py index d459f86c..4dfa2769 100644 --- a/archivebox/cli/archivebox_schedule.py +++ b/archivebox/cli/archivebox_schedule.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import schedule, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(schedule.__doc__) diff --git a/archivebox/cli/archivebox_server.py b/archivebox/cli/archivebox_server.py index ad65b459..0d529a40 100644 --- a/archivebox/cli/archivebox_server.py +++ b/archivebox/cli/archivebox_server.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import server, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(server.__doc__) diff --git a/archivebox/cli/archivebox_shell.py b/archivebox/cli/archivebox_shell.py index a1a9f874..5d5498cc 100644 --- a/archivebox/cli/archivebox_shell.py +++ b/archivebox/cli/archivebox_shell.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import shell, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(shell.__doc__) diff --git a/archivebox/cli/archivebox_status.py b/archivebox/cli/archivebox_status.py index 5d802e66..c0bed3fe 100644 --- a/archivebox/cli/archivebox_status.py +++ b/archivebox/cli/archivebox_status.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import status, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(status.__doc__) diff --git a/archivebox/cli/archivebox_update.py b/archivebox/cli/archivebox_update.py index f5e7a1fd..663e03f3 100644 --- a/archivebox/cli/archivebox_update.py +++ b/archivebox/cli/archivebox_update.py @@ -22,7 +22,7 @@ from ..index import ( get_corrupted_folders, get_unrecognized_folders, ) -from ..logging import SmartFormatter, accept_stdin +from ..logging_util import SmartFormatter, accept_stdin @docstring(update.__doc__) diff --git a/archivebox/cli/archivebox_version.py b/archivebox/cli/archivebox_version.py index fd1538a6..c56ab43f 100755 --- a/archivebox/cli/archivebox_version.py +++ b/archivebox/cli/archivebox_version.py @@ -10,7 +10,7 @@ from typing import Optional, List, IO from ..main import version, docstring from ..config import OUTPUT_DIR -from ..logging import SmartFormatter, reject_stdin +from ..logging_util import SmartFormatter, reject_stdin @docstring(version.__doc__) diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index 96438308..1cad374d 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -3,7 +3,7 @@ from django.utils.html import format_html from util import htmldecode, urldecode from core.models import Snapshot -from archivebox.logging import printable_filesize +from archivebox.logging_util import printable_filesize # TODO: https://stackoverflow.com/questions/40760880/add-custom-button-to-django-admin-panel diff --git a/archivebox/core/welcome_message.py b/archivebox/core/welcome_message.py index 0837e372..a948c78e 100644 --- a/archivebox/core/welcome_message.py +++ b/archivebox/core/welcome_message.py @@ -1,4 +1,4 @@ -from archivebox.logging import log_shell_welcome_msg +from archivebox.logging_util import log_shell_welcome_msg if __name__ == '__main__': diff --git a/archivebox/extractors/__init__.py b/archivebox/extractors/__init__.py index a440fe12..d67325ac 100644 --- a/archivebox/extractors/__init__.py +++ b/archivebox/extractors/__init__.py @@ -12,7 +12,7 @@ from ..index import ( patch_main_index, ) from ..util import enforce_types -from ..logging import ( +from ..logging_util import ( log_archiving_started, log_archiving_paused, log_archiving_finished, diff --git a/archivebox/extractors/archive_org.py b/archivebox/extractors/archive_org.py index 77cde22d..410e1ea6 100644 --- a/archivebox/extractors/archive_org.py +++ b/archivebox/extractors/archive_org.py @@ -19,7 +19,7 @@ from ..config import ( CURL_VERSION, CURL_USER_AGENT, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress diff --git a/archivebox/extractors/dom.py b/archivebox/extractors/dom.py index 49589cf1..de98f37b 100644 --- a/archivebox/extractors/dom.py +++ b/archivebox/extractors/dom.py @@ -16,7 +16,7 @@ from ..config import ( SAVE_DOM, CHROME_VERSION, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress diff --git a/archivebox/extractors/favicon.py b/archivebox/extractors/favicon.py index cd0b568a..0e46ef2c 100644 --- a/archivebox/extractors/favicon.py +++ b/archivebox/extractors/favicon.py @@ -15,7 +15,7 @@ from ..config import ( CHECK_SSL_VALIDITY, CURL_USER_AGENT, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress @enforce_types diff --git a/archivebox/extractors/git.py b/archivebox/extractors/git.py index f897c097..e23da07e 100644 --- a/archivebox/extractors/git.py +++ b/archivebox/extractors/git.py @@ -22,7 +22,7 @@ from ..config import ( GIT_DOMAINS, CHECK_SSL_VALIDITY ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress diff --git a/archivebox/extractors/media.py b/archivebox/extractors/media.py index 9c4d4a09..d4624b7c 100644 --- a/archivebox/extractors/media.py +++ b/archivebox/extractors/media.py @@ -18,7 +18,7 @@ from ..config import ( YOUTUBEDL_VERSION, CHECK_SSL_VALIDITY ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress @enforce_types diff --git a/archivebox/extractors/pdf.py b/archivebox/extractors/pdf.py index a63c24c8..56634aee 100644 --- a/archivebox/extractors/pdf.py +++ b/archivebox/extractors/pdf.py @@ -16,7 +16,7 @@ from ..config import ( SAVE_PDF, CHROME_VERSION, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress @enforce_types diff --git a/archivebox/extractors/screenshot.py b/archivebox/extractors/screenshot.py index 217dc77f..3d8819f7 100644 --- a/archivebox/extractors/screenshot.py +++ b/archivebox/extractors/screenshot.py @@ -16,7 +16,7 @@ from ..config import ( SAVE_SCREENSHOT, CHROME_VERSION, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress diff --git a/archivebox/extractors/title.py b/archivebox/extractors/title.py index 6442b947..e2d7e12e 100644 --- a/archivebox/extractors/title.py +++ b/archivebox/extractors/title.py @@ -18,7 +18,7 @@ from ..config import ( CURL_VERSION, CURL_USER_AGENT, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress HTML_TITLE_REGEX = re.compile( diff --git a/archivebox/extractors/wget.py b/archivebox/extractors/wget.py index 0e6cdafa..d233a12c 100644 --- a/archivebox/extractors/wget.py +++ b/archivebox/extractors/wget.py @@ -31,7 +31,7 @@ from ..config import ( WGET_USER_AGENT, COOKIES_FILE, ) -from ..logging import TimedProgress +from ..logging_util import TimedProgress @enforce_types diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index 298f61a2..89a84f1e 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -27,7 +27,7 @@ from ..config import ( ANSI, stderr, ) -from ..logging import ( +from ..logging_util import ( TimedProgress, log_indexing_process_started, log_indexing_process_finished, diff --git a/archivebox/logging.py b/archivebox/logging_util.py similarity index 100% rename from archivebox/logging.py rename to archivebox/logging_util.py diff --git a/archivebox/main.py b/archivebox/main.py index 0345588f..18f40b97 100644 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -88,7 +88,7 @@ from .config import ( USER_CONFIG, get_real_name, ) -from .logging import ( +from .logging_util import ( TERM_WIDTH, TimedProgress, log_importing_started, diff --git a/archivebox/parsers/__init__.py b/archivebox/parsers/__init__.py index 820fc9f9..40899b06 100644 --- a/archivebox/parsers/__init__.py +++ b/archivebox/parsers/__init__.py @@ -29,7 +29,7 @@ from ..util import ( URL_REGEX, ) from ..index.schema import Link -from ..logging import pretty_path, TimedProgress, log_source_saved +from ..logging_util import pretty_path, TimedProgress, log_source_saved from .pocket_html import parse_pocket_html_export from .pinboard_rss import parse_pinboard_rss_export from .shaarli_rss import parse_shaarli_rss_export