diff --git a/scrapy/xlib/simplejson/__init__.py b/scrapy/xlib/simplejson/__init__.py index dcfd5413b..9ae5fa698 100644 --- a/scrapy/xlib/simplejson/__init__.py +++ b/scrapy/xlib/simplejson/__init__.py @@ -121,7 +121,7 @@ OrderedDict = _import_OrderedDict() def _import_c_make_encoder(): try: - from simplejson._speedups import make_encoder + from scrapy.xlib.simplejson._speedups import make_encoder return make_encoder except ImportError: return None diff --git a/scrapy/xlib/simplejson/decoder.py b/scrapy/xlib/simplejson/decoder.py index 4cf4015f6..a6ce82f57 100644 --- a/scrapy/xlib/simplejson/decoder.py +++ b/scrapy/xlib/simplejson/decoder.py @@ -4,10 +4,10 @@ import re import sys import struct -from simplejson.scanner import make_scanner +from scrapy.xlib.simplejson.scanner import make_scanner def _import_c_scanstring(): try: - from simplejson._speedups import scanstring + from scrapy.xlib.simplejson._speedups import scanstring return scanstring except ImportError: return None diff --git a/scrapy/xlib/simplejson/encoder.py b/scrapy/xlib/simplejson/encoder.py index cab845653..a3b473a8c 100644 --- a/scrapy/xlib/simplejson/encoder.py +++ b/scrapy/xlib/simplejson/encoder.py @@ -5,13 +5,13 @@ from decimal import Decimal def _import_speedups(): try: - from simplejson import _speedups + from scrapy.xlib.simplejson import _speedups return _speedups.encode_basestring_ascii, _speedups.make_encoder except ImportError: return None, None c_encode_basestring_ascii, c_make_encoder = _import_speedups() -from simplejson.decoder import PosInf +from scrapy.xlib.simplejson.decoder import PosInf ESCAPE = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t]') ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])') diff --git a/scrapy/xlib/simplejson/scanner.py b/scrapy/xlib/simplejson/scanner.py index 54593a371..ac99c2708 100644 --- a/scrapy/xlib/simplejson/scanner.py +++ b/scrapy/xlib/simplejson/scanner.py @@ -3,7 +3,7 @@ import re def _import_c_make_scanner(): try: - from simplejson._speedups import make_scanner + from scrapy.xlib.simplejson._speedups import make_scanner return make_scanner except ImportError: return None