From 389882eb131250a1eb8418580b165625dd854bf0 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Mon, 14 Jul 2014 17:15:28 +0800 Subject: [PATCH] PY3: use six.moves.cPickle --- scrapy/contrib/exporter/__init__.py | 2 +- scrapy/contrib/httpcache.py | 2 +- scrapy/contrib/spiderstate.py | 3 ++- scrapy/squeue.py | 3 ++- scrapy/tests/test_contrib_exporter.py | 3 ++- scrapy/utils/project.py | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scrapy/contrib/exporter/__init__.py b/scrapy/contrib/exporter/__init__.py index a86ae19c6..e7624c983 100644 --- a/scrapy/contrib/exporter/__init__.py +++ b/scrapy/contrib/exporter/__init__.py @@ -6,7 +6,7 @@ import csv import sys import pprint import marshal -import cPickle as pickle +from six.moves import cPickle as pickle from xml.sax.saxutils import XMLGenerator from scrapy.utils.serialize import ScrapyJSONEncoder from scrapy.item import BaseItem diff --git a/scrapy/contrib/httpcache.py b/scrapy/contrib/httpcache.py index 549227424..c5cb3023f 100644 --- a/scrapy/contrib/httpcache.py +++ b/scrapy/contrib/httpcache.py @@ -1,6 +1,6 @@ from __future__ import print_function import os -import cPickle as pickle +from six.moves import cPickle as pickle from importlib import import_module from time import time from weakref import WeakKeyDictionary diff --git a/scrapy/contrib/spiderstate.py b/scrapy/contrib/spiderstate.py index 478ef752b..3006a071a 100644 --- a/scrapy/contrib/spiderstate.py +++ b/scrapy/contrib/spiderstate.py @@ -1,4 +1,5 @@ -import os, cPickle as pickle +import os +from six.moves import cPickle as pickle from scrapy import signals diff --git a/scrapy/squeue.py b/scrapy/squeue.py index 2ed8e8300..6e2a60fd2 100644 --- a/scrapy/squeue.py +++ b/scrapy/squeue.py @@ -2,7 +2,8 @@ Scheduler queues """ -import marshal, cPickle as pickle +import marshal +from six.moves import cPickle as pickle from queuelib import queue diff --git a/scrapy/tests/test_contrib_exporter.py b/scrapy/tests/test_contrib_exporter.py index 9ced21c80..d50544c51 100644 --- a/scrapy/tests/test_contrib_exporter.py +++ b/scrapy/tests/test_contrib_exporter.py @@ -1,4 +1,5 @@ -import unittest, json, cPickle as pickle +import unittest, json +from six.moves import cPickle as pickle from cStringIO import StringIO import lxml.etree import re diff --git a/scrapy/utils/project.py b/scrapy/utils/project.py index 34cd8e520..a15a0d90f 100644 --- a/scrapy/utils/project.py +++ b/scrapy/utils/project.py @@ -1,5 +1,5 @@ import os -import cPickle as pickle +from six.moves import cPickle as pickle import warnings from importlib import import_module