fix: pin bleach to version <5

mezzanine/accounts/forms.py

@@ -31,7 +31,6 @@ class Meta:
  model = get_profile_model()
  exclude = (get_profile_user_fieldname(),) + _exclude_fields
 
-
 except ProfileNotConfigured:
  pass
 

mezzanine/core/admin.py

@@ -47,7 +47,6 @@ class Media:
  "all": (static("mezzanine/css/admin/tabbed_translation_fields.css"),),
  }
 
-
 else:
 
  class BaseTranslationModelAdmin(admin.ModelAdmin):

mezzanine/core/fields.py

@@ -112,7 +112,6 @@ def __init__(self, *args, **kwargs):
  kwargs.pop(fb_arg, None)
  super().__init__(*args, **kwargs)
 
-
 else:
 
  class FileField(FileBrowseField):

mezzanine/core/managers.py

@@ -247,7 +247,7 @@ def annotate_scores(self):
  if result.publish_date:
  age = (now() - result.publish_date).total_seconds()
  if age > 0:
- count = count / age ** settings.SEARCH_AGE_SCALE_FACTOR
+ count = count / age**settings.SEARCH_AGE_SCALE_FACTOR
 
  results[i].result_count = count
  return iter(results)

mezzanine/core/templatetags/mezzanine_tags.py

@@ -52,7 +52,6 @@ def compress(parser, token):
 
  return compress(parser, token)
 
-
 else:
 
  @register.to_end_tag

mezzanine/utils/html.py

@@ -9,7 +9,6 @@
  class HTMLParseError(Exception):
  pass
 
-
 except ImportError: # Python 2
  from HTMLParser import HTMLParser, HTMLParseError
  from htmlentitydefs import name2codepoint

setup.cfg

@@ -43,7 +43,7 @@ install_requires =
  django-contrib-comments >= 2.0
  django >= 2.2
  tzlocal >= 2
- bleach >= 2
+ bleach >= 2, <5
  beautifulsoup4 >= 4.5.3
  requests >= 2.1.0
  requests-oauthlib >= 1.3
@@ -59,7 +59,7 @@ testing =
  pytest-cov >= 2, < 3
 codestyle =
  flake8 >= 3, <4
- black==20.8b1
+ black == 22.3.0
  isort >= 5, <6
  pyupgrade >= 2, <3
 

tests/test_core.py

@@ -309,14 +309,14 @@ def test_static_proxy_with_static_url_with_full_host(self):
 
  def _get_csrftoken(self, response):
  csrf = re.findall(
- br'<input type="hidden" name="csrfmiddlewaretoken" ' br'value="([^"]+)">',
+ rb'<input type="hidden" name="csrfmiddlewaretoken" ' rb'value="([^"]+)">',
  response.content,
  )
  self.assertEqual(len(csrf), 1, "No csrfmiddlewaretoken found!")
  return csrf[0]
 
  def _get_formurl(self, response):
- action = re.findall(br'<form action="([^"]*)" method="post">', response.content)
+ action = re.findall(rb'<form action="([^"]*)" method="post">', response.content)
  self.assertEqual(len(action), 1, "No form with action found!")
  if action[0] == b"":
  action = response.request["PATH_INFO"]