Skip to content

Commit

Permalink
Merge pull request #354 from shahin/master
Browse files Browse the repository at this point in the history
Fix #353 by using simplejson where available
  • Loading branch information
fgregg committed Feb 12, 2015
2 parents 6ab8d3f + f4528bb commit b189c12
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dedupe/backport.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
from ordereddict import OrderedDict

try:
from json.scanner import py_make_scanner
import json
except ImportError:
from simplejson.scanner import py_make_scanner
import simplejson as json
except ImportError:
from json.scanner import py_make_scanner
import json


def cartesian(arrays, out=None):
Expand Down

0 comments on commit b189c12

Please sign in to comment.