Merge branch 'pr/136'

bleach/__init__.py

@@ -145,8 +145,10 @@ def replace_nodes(tree, new_frag, node, index=0):
         # capture any non-tag text at the start of the fragment
         if new_tree.text:
             if index == 0:
+                tree.text = tree.text or ''
                 tree.text += new_tree.text
             else:
+                tree[index-1].tail = tree[index-1].tail or ''
                 tree[index-1].tail += new_tree.text
         # the put in the tagged elements into the old tree
         for n in new_tree:

bleach/tests/test_links.py

@@ -446,3 +446,10 @@ def test_elements_inside_links():
 
     eq_('<a href="#" rel="nofollow"><strong>bold</strong> hello<br></a>',
         linkify('<a href="#"><strong>bold</strong> hello<br></a>'))
+
+
+def test_remove_first_childlink():
+    expect = '<p>something</p>'
+    callbacks = [lambda *a: None]
+    eq_(expect,
+        linkify('<p><a href="/foo">something</a></p>', callbacks=callbacks))