From f430ee323a61483a07120f259d89b5110b340345 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 21 2017 12:48:23 +0000
Subject: [PATCH 1/2] Fix running the tests against bleach 1.5.0


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 4e15f14..de7a061 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -3382,7 +3382,24 @@ def clean_input(text, ignore=None):
             if tag in tags:
                 tags.remove(tag)
 
-    return bleach.clean(text, tags=tags, attributes=attrs)
+    args = {
+        'tags': tags,
+        'attributes': attrs
+    }
+
+    # newer bleach allow to customize the protocol supported
+    bleach_v = bleach.__version__.split('.')
+    for idx, val in enumerate(bleach_v):
+        try:
+            val = int(val)
+        except ValueError:
+            pass
+        bleach_v[idx] = val
+    if tuple(bleach_v) >= (1, 5, 0):
+        protocols=bleach.ALLOWED_PROTOCOLS + ['irc', 'ircs']
+        args['protocols'] = protocols
+
+    return bleach.clean(text, **args)
 
 
 def could_be_text(text):
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 7c864f0..c0b307d 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -3333,6 +3333,16 @@ class PagureLibtests(tests.Modeltests):
         self.assertEqual(iss.id, 8)
         self.assertEqual(iss.title, 'private issue #8')
 
+        # newer bleach allow to customize the protocol supported
+        import bleach
+        bleach_v = bleach.__version__.split('.')
+        for idx, val in enumerate(bleach_v):
+            try:
+                val = int(val)
+            except ValueError:
+                pass
+            bleach_v[idx] = val
+
         texts = [
             'foo bar test#1 see?',
             'foo bar pingou/test#2 I mean, really',
@@ -3394,7 +3404,9 @@ class PagureLibtests(tests.Modeltests):
             # and the version 1.4.3 that we have won't let us adjust the
             # list of supported protocols
             # '<p><a href="ircs://pagure.io">ircs://pagure.io</a></p>',
-            '<p><a>ircs://pagure.io</a></p>',
+            '<p><a href="ircs://pagure.io">ircs://pagure.io</a></p>' if
+            tuple(bleach_v) >= (1, 5, 0)
+            else '<p><a>ircs://pagure.io</a></p>',
             # 'http://pagure.io'
             '<p><a href="http://pagure.io">http://pagure.io</a></p>',
             # 'https://pagure.io'

From 4c40047e7fd7d4a4307c730867caa132f9c65878 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 21 2017 13:53:00 +0000
Subject: [PATCH 2/2] Rename the variable from args to kwargs to make it more obvious what it is


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index de7a061..3b48fa7 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -3382,7 +3382,7 @@ def clean_input(text, ignore=None):
             if tag in tags:
                 tags.remove(tag)
 
-    args = {
+    kwargs = {
         'tags': tags,
         'attributes': attrs
     }
@@ -3397,9 +3397,9 @@ def clean_input(text, ignore=None):
         bleach_v[idx] = val
     if tuple(bleach_v) >= (1, 5, 0):
         protocols=bleach.ALLOWED_PROTOCOLS + ['irc', 'ircs']
-        args['protocols'] = protocols
+        kwargs['protocols'] = protocols
 
-    return bleach.clean(text, **args)
+    return bleach.clean(text, **kwargs)
 
 
 def could_be_text(text):