make gargoyle work with Django 1.5

disqus / gargoyle

Feature switches in Django

http://engineering.disqus.com

Apache License 2.0

746 stars 112 forks source link

make gargoyle work with Django 1.5 #70

Closed ricardokirkner closed 11 years ago

ricardokirkner commented 11 years ago

This pull requests allows gargoyle to work with Django 1.5.

Changes

use json from stdlib if available and only fallback to django's simplejson if not (django has deprecated the use of simplejson as they dropped support for Python 2.5)
fix templates to use quotes around url pattern names
updated setup.py to allow depending on Django 1.5

Fluxx commented 11 years ago

Did you see the build/test failures?

ricardokirkner commented 11 years ago

@Fluxx I did not (wasn't even aware of this feature, nice!) I will take a look and make sure to fix, thanks!

ricardokirkner commented 11 years ago

@Fluxx, interesting enough these failures don't come from my pull request, but predate it. The assertIn/assertNotIn test failures can be fixed by using assertTrue/assertFalse instead (looks like the unittest shipped with the old django doesn't support these helpers). The other failure I don't know, but it predates the pull request too.

ricardokirkner commented 11 years ago

Alright, tests have been fixed. Build is green.

On Thu, May 16, 2013 at 2:25 PM, Jeff Pollard notifications@github.comwrote:

Did you see the build/test failures?

— Reply to this email directly or view it on GitHubhttps://github.com/disqus/gargoyle/pull/70#issuecomment-18015834 .

ajvb commented 11 years ago

Can someone please merge these pull requests?

mmilkin-rue commented 11 years ago

bump.

Fluxx commented 11 years ago

Just made the merge. Once I update CI work with Django 1.5 I'll ship a new release.