1
0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-25 11:24:24 +00:00

fixed imports in scrapy.xlib.simplejson

This commit is contained in:
Pablo Hoffman 2010-10-27 08:05:08 -02:00
parent 9b9ab37804
commit 665578bfe8
4 changed files with 6 additions and 6 deletions

View File

@ -121,7 +121,7 @@ OrderedDict = _import_OrderedDict()
def _import_c_make_encoder(): def _import_c_make_encoder():
try: try:
from simplejson._speedups import make_encoder from scrapy.xlib.simplejson._speedups import make_encoder
return make_encoder return make_encoder
except ImportError: except ImportError:
return None return None

View File

@ -4,10 +4,10 @@ import re
import sys import sys
import struct import struct
from simplejson.scanner import make_scanner from scrapy.xlib.simplejson.scanner import make_scanner
def _import_c_scanstring(): def _import_c_scanstring():
try: try:
from simplejson._speedups import scanstring from scrapy.xlib.simplejson._speedups import scanstring
return scanstring return scanstring
except ImportError: except ImportError:
return None return None

View File

@ -5,13 +5,13 @@ from decimal import Decimal
def _import_speedups(): def _import_speedups():
try: try:
from simplejson import _speedups from scrapy.xlib.simplejson import _speedups
return _speedups.encode_basestring_ascii, _speedups.make_encoder return _speedups.encode_basestring_ascii, _speedups.make_encoder
except ImportError: except ImportError:
return None, None return None, None
c_encode_basestring_ascii, c_make_encoder = _import_speedups() 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 = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t]')
ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])') ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')

View File

@ -3,7 +3,7 @@
import re import re
def _import_c_make_scanner(): def _import_c_make_scanner():
try: try:
from simplejson._speedups import make_scanner from scrapy.xlib.simplejson._speedups import make_scanner
return make_scanner return make_scanner
except ImportError: except ImportError:
return None return None