Merged master and manage-users—implements unpolished co-editor feature

[ndarville]

• Push CSS diff to sass branch
• Fix Travis-only problem

[ndarville]

elementtree package breaks. Need to change my requirements.txt to just include the package with no versioning.

Thing is, the package was updated on manage-users, but the change hasn’t made it to requirements.txt, looks like.

[ndarville]

So, using both the general and specific versioning of elementtree didn’t take.

[ndarville]

Using pip --pre -r requirements.txt had the same result. Last idea: --allow-external.

[ndarville]

And this is why you don’t push a PR fix right after a nap.

[coveralls]

Changes Unknown when pulling 8e82d53 on manage-users into * on master*.

[ndarville]

Managed to reproduce Travis errors locally.

[ndarville]

Looks like the created server itself works perfectly; perhaps the test itself is broken.

Could be bleach:

>>> from forum.views import sanitized_smartdown as sd
>>> sd("foo")
No handlers could be found for logger "bleach"

======================================================================
FAIL: Tests the HTML input of an abbr element.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/darville/Dropbox/projects/django/pony-forum/pony-forum/forum/input_tests.py", line 94, in test_html
    self.assertEquals(sd(self.output), self.output)
AssertionError: u'' != '<p><abbr>foo</abbr></p>'
-------------------- >> begin captured logging << --------------------
bleach: ERROR: HTML: TypeError("'NoneType' object is not callable",)
Traceback (most recent call last):
  File "~/pony-forum/venv/lib/python2.7/site-packages/bleach/__init__.py", line 326, in _render
    return force_unicode(_serialize(tree))
  File "~/pony-forum/venv/lib/python2.7/site-packages/bleach/__init__.py", line 338, in _serialize
    stream = walker(domtree)
TypeError: 'NoneType' object is not callable
bleach: ERROR: XML: AttributeError('toxml',)
Traceback (most recent call last):
  File "~/pony-forum/venv/lib/python2.7/site-packages/bleach/__init__.py", line 330, in _render
    return force_unicode(tree.toxml())
AttributeError: toxml
--------------------- >> end captured logging << ---------------------

>>> from forum.views import sanitized_smartdown as sd
>>> sd("foo")
No handlers could be found for logger "bleach"
u''

>>> import bleach
>>> bleach.clean("FOO")
u''
>>> bleach.clean("<a>FOO</a>")
u''
>>> 

[ndarville]

Updating bleach to 1.2.2 fixed it.

[ndarville]

Now to pull SCSS and merge.

[ndarville]

Looks like I had already pushed the CSS diff: c3bf4b9.