diff options
| -rw-r--r-- | tests/test_contrib/test_django/test_templatetags/test_pykss.py | 4 | ||||
| -rw-r--r-- | tox.ini | 10 |
2 files changed, 4 insertions, 10 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.') @@ -1,10 +1,10 @@ [tox] -envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py26-djangotrunk, py27-djangotrunk, pypy-djangotrunk +envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py27-djangotrunk, pypy-djangotrunk [testenv] commands = python setup.py test deps = - django==1.5 + django==1.5.1 mock pytest @@ -29,12 +29,6 @@ deps = mock pytest -[testenv:py26-djangotrunk] -basepython=python2.6 -deps = - https://github.com/django/django/tarball/master - mock - pytest [testenv:py27-djangotrunk] basepython = python2.7 |