From 9806ed8d8c1475f58fd724b608448ece3c52050b Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 28 Jul 2020 06:50:03 -0400 Subject: [PATCH] fix circular import --- archivebox/core/admin.py | 10 +++++----- archivebox/core/settings.py | 2 +- archivebox/main.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index 9fcdccab..01ca20b8 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -14,11 +14,11 @@ from django.contrib.auth import get_user_model from core.models import Snapshot from core.forms import AddLinkForm -from ..util import htmldecode, urldecode, ansi_to_html -from ..logging_util import printable_filesize -from ..main import add, remove -from ..config import OUTPUT_DIR -from ..extractors import archive_links +from util import htmldecode, urldecode, ansi_to_html +from logging_util import printable_filesize +from main import add, remove +from config import OUTPUT_DIR +from extractors import archive_links # TODO: https://stackoverflow.com/questions/40760880/add-custom-button-to-django-admin-panel diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index babcf35e..14b3b369 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -112,7 +112,7 @@ LANGUAGE_CODE = 'en-us' TIME_ZONE = 'UTC' USE_I18N = False USE_L10N = False -USE_TZ = True +USE_TZ = False DATETIME_FORMAT = 'Y-m-d g:iA' SHORT_DATETIME_FORMAT = 'Y-m-d h:iA' diff --git a/archivebox/main.py b/archivebox/main.py index 59155580..09f1a1be 100644 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -56,7 +56,7 @@ from .config import ( stderr, ConfigDict, ANSI, - IS_TTY, + # IS_TTY, USER, ARCHIVEBOX_BINARY, ONLY_NEW,