1. Ralph Bean
  2. strainer

Commits

Ralph Bean  committed 785bd6d

Un-require simplejson.

  • Participants
  • Parent commits cb52c96
  • Branches default

Comments (0)

Files changed (2)

File setup.py

View file
  • Ignore whitespace
       zip_safe=True,
       install_requires=[
           # -*- Extra requirements: -*-
-          'simplejson',
       ],
       tests_require=[
           'nose',

File strainer/operators.py

View file
  • Ignore whitespace
 from xml.parsers.expat import ExpatError
 import copy, re
 from pprint import pformat, pprint
-from simplejson import loads
+try:
+    from simplejson import loads
+except ImportError:
+    from json import loads
+
 from nose.tools import *
 from almostequal import approx_equal
 import strainer.log as log