Merge pull request #797 from felixonmars/py3-port

PY3: use six.moves.cPickle

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

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

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
 

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
 

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

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