New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 26 commits into from May 3, 2014

Conversation

Projects
None yet
2 participants
@ndarville
Owner

ndarville commented Mar 2, 2014

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

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville Mar 2, 2014

Owner

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.

Owner

ndarville commented Mar 2, 2014

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

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville Mar 2, 2014

Owner

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

Owner

ndarville commented Mar 2, 2014

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

@ndarville

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville Mar 3, 2014

Owner

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

Owner

ndarville commented Mar 3, 2014

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

@ndarville

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville Mar 3, 2014

Owner

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

Owner

ndarville commented Mar 3, 2014

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

@coveralls

This comment has been minimized.

Show comment
Hide comment
@coveralls

coveralls Mar 3, 2014

Coverage Status

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

Coverage Status

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

@ndarville

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville May 3, 2014

Owner

Managed to reproduce Travis errors locally.

Owner

ndarville commented May 3, 2014

Managed to reproduce Travis errors locally.

@ndarville

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville May 3, 2014

Owner

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''
>>> 
Owner

ndarville commented May 3, 2014

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

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville May 3, 2014

Owner

Updating bleach to 1.2.2 fixed it.

Owner

ndarville commented May 3, 2014

Updating bleach to 1.2.2 fixed it.

@ndarville

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville May 3, 2014

Owner

Now to pull SCSS and merge.

Owner

ndarville commented May 3, 2014

Now to pull SCSS and merge.

@ndarville

This comment has been minimized.

Show comment
Hide comment
@ndarville

ndarville May 3, 2014

Owner

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

Owner

ndarville commented May 3, 2014

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

ndarville added a commit that referenced this pull request May 3, 2014

Merge pull request #127 from ndarville/manage-users
Merged manage-users branch; implements unpolished co-editor feature

@ndarville ndarville merged commit e8bed6e into master May 3, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment