mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 06:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix circular import

Browse source
This commit is contained in:
Nick Sweeting 2020-07-28 06:50:03 -04:00
parent 9c59582722
commit 9806ed8d8c
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
archivebox/core/admin.py
View file

@ -14,11 +14,11 @@ from django.contrib.auth import get_user_model
from core.models import Snapshot from core.models import Snapshot
from core.forms import AddLinkForm from core.forms import AddLinkForm
from ..util import htmldecode, urldecode, ansi_to_html from util import htmldecode, urldecode, ansi_to_html
from ..logging_util import printable_filesize from logging_util import printable_filesize
from ..main import add, remove from main import add, remove
from ..config import OUTPUT_DIR from config import OUTPUT_DIR
from ..extractors import archive_links from extractors import archive_links
# TODO: https://stackoverflow.com/questions/40760880/add-custom-button-to-django-admin-panel # TODO: https://stackoverflow.com/questions/40760880/add-custom-button-to-django-admin-panel

2
archivebox/core/settings.py
View file

@ -112,7 +112,7 @@ LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC' TIME_ZONE = 'UTC'
USE_I18N = False USE_I18N = False
USE_L10N = False USE_L10N = False
USE_TZ = True USE_TZ = False
DATETIME_FORMAT = 'Y-m-d g:iA' DATETIME_FORMAT = 'Y-m-d g:iA'
SHORT_DATETIME_FORMAT = 'Y-m-d h:iA' SHORT_DATETIME_FORMAT = 'Y-m-d h:iA'

2
archivebox/main.py
View file

@ -56,7 +56,7 @@ from .config import (
stderr, stderr,
ConfigDict, ConfigDict,
ANSI, ANSI,
IS_TTY, # IS_TTY,
USER, USER,
ARCHIVEBOX_BINARY, ARCHIVEBOX_BINARY,
ONLY_NEW, ONLY_NEW,