Browse Source

fix circular import

Nick Sweeting 5 years ago
parent
commit
9806ed8d8c
3 changed files with 7 additions and 7 deletions
  1. 5 5
      archivebox/core/admin.py
  2. 1 1
      archivebox/core/settings.py
  3. 1 1
      archivebox/main.py

+ 5 - 5
archivebox/core/admin.py

@@ -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 ..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
 # TODO: https://stackoverflow.com/questions/40760880/add-custom-button-to-django-admin-panel
 
 

+ 1 - 1
archivebox/core/settings.py

@@ -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'

+ 1 - 1
archivebox/main.py

@@ -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,