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

fix git conflict commited by accident

Browse source
This commit is contained in:
Nick Sweeting 2020-07-02 03:22:37 -04:00
parent 2ece5c20cf
commit 3ec97e5528
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
archivebox/util.py
View file

@ -60,14 +60,12 @@ URL_REGEX = re.compile(
re.IGNORECASE, re.IGNORECASE,
) )
<<<<<<< HEAD
COLOR_REGEX = re.compile(r'\[(?P<arg_1>\d+)(;(?P<arg_2>\d+)(;(?P<arg_3>\d+))?)?m') COLOR_REGEX = re.compile(r'\[(?P<arg_1>\d+)(;(?P<arg_2>\d+)(;(?P<arg_3>\d+))?)?m')
=======
def is_static_file(url: str): def is_static_file(url: str):
# TODO: the proper way is with MIME type detection + ext, not only extension # TODO: the proper way is with MIME type detection + ext, not only extension
from .config import STATICFILE_EXTENSIONS from .config import STATICFILE_EXTENSIONS
return extension(url).lower() in STATICFILE_EXTENSIONS return extension(url).lower() in STATICFILE_EXTENSIONS
>>>>>>> c1fe068... remove circular import possibilities
def enforce_types(func): def enforce_types(func):
@ -204,7 +202,7 @@ def ansi_to_html(text):
Based on: https://stackoverflow.com/questions/19212665/python-converting-ansi-color-codes-to-html Based on: https://stackoverflow.com/questions/19212665/python-converting-ansi-color-codes-to-html
""" """
from .config import COLOR_DICT from .config import COLOR_DICT
TEMPLATE = '<span style="color: rgb{}"><br>' TEMPLATE = '<span style="color: rgb{}"><br>'
text = text.replace('[m', '</span>') text = text.replace('[m', '</span>')