Merge branch 'master' into pyup-scheduled-update-10-30-2017

* master:
  Fix bug due to bleach upgrade.
  Update bleach from 2.0.0 to 2.1.1
  Update jinja2 from 2.9.6 to 2.10
  Update sqlalchemy from 1.1.14 to 1.1.15

atramhasis/validators.py

@@ -29,7 +29,18 @@ class Label(colander.MappingSchema):
 
 
 def html_preparer(value):
-    return bleach.clean(value, tags=['strong', 'em', 'a'], strip=True)
+    '''
+    Prepare the value by stripping all html except certain tags.
+
+    :param value: The value to be cleaned. 
+    :rtype: str
+    '''
+    try:
+        return bleach.clean(value, tags=['strong', 'em', 'a'], strip=True)
+    except TypeError as e:
+        # Trying to clean a non-string
+        # Ignore for now so it can be caught later on
+        return value
 
 
 class Note(colander.MappingSchema):

requirements.txt

@@ -20,13 +20,13 @@ skosprovider_heritagedata==0.3.1
 language-tags==0.4.3
 
 # sqlalchemy
-sqlalchemy==1.1.14
+sqlalchemy==1.1.15
 zope.sqlalchemy==0.7.7
 transaction==2.1.2
 psycopg2==2.7.3.2
 
 # jinja2
-jinja2==2.9.6
+jinja2==2.10
 pyramid-jinja2==2.7
 Babel==2.5.1