aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_contrib
diff options
context:
space:
mode:
authorSean Brant2013-07-13 10:51:22 -0500
committerSean Brant2013-07-13 10:57:43 -0500
commitdc8c1dce14c8ffcd0d1516b8ab52ae6f775d7337 (patch)
treea8c516da20e46ea355d4675a84b57346db2eff1b /tests/test_contrib
parent82863b05a6767bb425985ebcb217ddea27d8f03b (diff)
downloadpykss-dc8c1dce14c8ffcd0d1516b8ab52ae6f775d7337.tar.bz2
Fixes issues with Django trunk
Use the built in json module instead of django's simple json bumps versions in tox
Diffstat (limited to 'tests/test_contrib')
-rw-r--r--tests/test_contrib/test_django/test_templatetags/test_pykss.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_contrib/test_django/test_templatetags/test_pykss.py b/tests/test_contrib/test_django/test_templatetags/test_pykss.py
index 442865c..808992f 100644
--- a/tests/test_contrib/test_django/test_templatetags/test_pykss.py
+++ b/tests/test_contrib/test_django/test_templatetags/test_pykss.py
@@ -1,9 +1,9 @@
+import json
import os
from django.conf import settings
from django.template import Context, Template, TemplateSyntaxError
from django.test import TestCase
-from django.utils import simplejson
from mock import patch, ANY
@@ -73,7 +73,7 @@ class StyleguideBlockTestCase(TestCase):
{% endstyleguideblock %}
""")
context = Context({'styleguide': self.styleguide})
- results = simplejson.loads(template.render(context))
+ results = json.loads(template.render(context))
self.assertEqual(results['section'], '2.1.1')
self.assertEqual(results['filename'], 'buttons.css')
self.assertEqual(results['description'], 'Your standard form button.')