From ae4a61a2d530bc55103ea786f950abde3ce6739d Mon Sep 17 00:00:00 2001 From: alexanderlukanin13 Date: Sun, 20 Oct 2013 11:55:07 +0600 Subject: [PATCH] Added "from __future__ import print_function" in all relevant places except xlib --- extras/qps-bench-server.py | 1 + extras/scrapy-ws.py | 1 + scrapy/__init__.py | 1 + scrapy/cmdline.py | 1 + scrapy/commands/check.py | 1 + scrapy/commands/deploy.py | 1 + scrapy/commands/fetch.py | 1 + scrapy/commands/genspider.py | 1 + scrapy/commands/list.py | 1 + scrapy/commands/parse.py | 1 + scrapy/commands/settings.py | 1 + scrapy/commands/startproject.py | 1 + scrapy/commands/version.py | 1 + scrapy/contrib/httpcache.py | 1 + scrapy/contrib/pipeline/media.py | 1 + scrapy/dupefilter.py | 1 + scrapy/shell.py | 1 + scrapy/tests/mockserver.py | 1 + scrapy/tests/test_downloadermiddleware_httpcache.py | 1 + scrapy/tests/test_engine.py | 1 + scrapy/tests/test_pipeline_media.py | 1 + scrapy/tests/test_utils_request.py | 1 + scrapy/utils/display.py | 1 + scrapy/utils/engine.py | 1 + scrapy/utils/request.py | 1 + scrapy/utils/testsite.py | 1 + scrapy/utils/trackref.py | 1 + 27 files changed, 27 insertions(+) diff --git a/extras/qps-bench-server.py b/extras/qps-bench-server.py index da7a0022b..3bef20bf3 100755 --- a/extras/qps-bench-server.py +++ b/extras/qps-bench-server.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import print_function from time import time from collections import deque from twisted.web.server import Site, NOT_DONE_YET diff --git a/extras/scrapy-ws.py b/extras/scrapy-ws.py index 4af65c009..60fdfd4af 100755 --- a/extras/scrapy-ws.py +++ b/extras/scrapy-ws.py @@ -11,6 +11,7 @@ command). """ +from __future__ import print_function import sys, optparse, urllib, json from urlparse import urljoin diff --git a/scrapy/__init__.py b/scrapy/__init__.py index f787d97d6..af904e89d 100644 --- a/scrapy/__init__.py +++ b/scrapy/__init__.py @@ -1,6 +1,7 @@ """ Scrapy - a screen scraping framework written in Python """ +from __future__ import print_function import pkgutil __version__ = pkgutil.get_data(__package__, 'VERSION').strip() version_info = tuple(__version__.split('.')[:3]) diff --git a/scrapy/cmdline.py b/scrapy/cmdline.py index 678a91e75..4601cebfc 100644 --- a/scrapy/cmdline.py +++ b/scrapy/cmdline.py @@ -1,3 +1,4 @@ +from __future__ import print_function import sys import optparse import cProfile diff --git a/scrapy/commands/check.py b/scrapy/commands/check.py index 0d5cd7632..c69700215 100644 --- a/scrapy/commands/check.py +++ b/scrapy/commands/check.py @@ -1,3 +1,4 @@ +from __future__ import print_function from collections import defaultdict from functools import wraps from unittest import TextTestRunner diff --git a/scrapy/commands/deploy.py b/scrapy/commands/deploy.py index 14b5a5229..62b57d3ed 100644 --- a/scrapy/commands/deploy.py +++ b/scrapy/commands/deploy.py @@ -1,3 +1,4 @@ +from __future__ import print_function import sys import os import glob diff --git a/scrapy/commands/fetch.py b/scrapy/commands/fetch.py index 485dfd478..cf3b1ae7e 100644 --- a/scrapy/commands/fetch.py +++ b/scrapy/commands/fetch.py @@ -1,3 +1,4 @@ +from __future__ import print_function from w3lib.url import is_url from scrapy.command import ScrapyCommand diff --git a/scrapy/commands/genspider.py b/scrapy/commands/genspider.py index cc372b465..f8a5e2310 100644 --- a/scrapy/commands/genspider.py +++ b/scrapy/commands/genspider.py @@ -1,3 +1,4 @@ +from __future__ import print_function import os import shutil import string diff --git a/scrapy/commands/list.py b/scrapy/commands/list.py index 9299c4811..f08d57f6f 100644 --- a/scrapy/commands/list.py +++ b/scrapy/commands/list.py @@ -1,3 +1,4 @@ +from __future__ import print_function from scrapy.command import ScrapyCommand class Command(ScrapyCommand): diff --git a/scrapy/commands/parse.py b/scrapy/commands/parse.py index ca8f1e19f..0867a21a0 100644 --- a/scrapy/commands/parse.py +++ b/scrapy/commands/parse.py @@ -1,3 +1,4 @@ +from __future__ import print_function from w3lib.url import is_url from scrapy.command import ScrapyCommand from scrapy.http import Request diff --git a/scrapy/commands/settings.py b/scrapy/commands/settings.py index 80999e231..b8e0fe08c 100644 --- a/scrapy/commands/settings.py +++ b/scrapy/commands/settings.py @@ -1,3 +1,4 @@ +from __future__ import print_function from scrapy.command import ScrapyCommand class Command(ScrapyCommand): diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py index 27a68ca57..eeb04cda9 100644 --- a/scrapy/commands/startproject.py +++ b/scrapy/commands/startproject.py @@ -1,3 +1,4 @@ +from __future__ import print_function import sys import string import re diff --git a/scrapy/commands/version.py b/scrapy/commands/version.py index 2c22a73c7..76b97200d 100644 --- a/scrapy/commands/version.py +++ b/scrapy/commands/version.py @@ -1,3 +1,4 @@ +from __future__ import print_function import sys import platform diff --git a/scrapy/contrib/httpcache.py b/scrapy/contrib/httpcache.py index d952f43e8..c4552b925 100644 --- a/scrapy/contrib/httpcache.py +++ b/scrapy/contrib/httpcache.py @@ -1,3 +1,4 @@ +from __future__ import print_function import os import cPickle as pickle from time import time diff --git a/scrapy/contrib/pipeline/media.py b/scrapy/contrib/pipeline/media.py index 21b09150a..82270e15d 100644 --- a/scrapy/contrib/pipeline/media.py +++ b/scrapy/contrib/pipeline/media.py @@ -1,3 +1,4 @@ +from __future__ import print_function from collections import defaultdict from twisted.internet.defer import Deferred, DeferredList from twisted.python.failure import Failure diff --git a/scrapy/dupefilter.py b/scrapy/dupefilter.py index 4e3cb1cf2..67989d8d3 100644 --- a/scrapy/dupefilter.py +++ b/scrapy/dupefilter.py @@ -1,3 +1,4 @@ +from __future__ import print_function import os from scrapy.utils.request import request_fingerprint from scrapy.utils.job import job_dir diff --git a/scrapy/shell.py b/scrapy/shell.py index cd94f4b5a..401d80c24 100644 --- a/scrapy/shell.py +++ b/scrapy/shell.py @@ -3,6 +3,7 @@ Scrapy Shell See documentation in docs/topics/shell.rst """ +from __future__ import print_function import signal from twisted.internet import reactor, threads, defer diff --git a/scrapy/tests/mockserver.py b/scrapy/tests/mockserver.py index 14138e58c..c17bc7ce2 100644 --- a/scrapy/tests/mockserver.py +++ b/scrapy/tests/mockserver.py @@ -1,3 +1,4 @@ +from __future__ import print_function import sys, time, random, urllib, os from subprocess import Popen, PIPE from twisted.web.server import Site, NOT_DONE_YET diff --git a/scrapy/tests/test_downloadermiddleware_httpcache.py b/scrapy/tests/test_downloadermiddleware_httpcache.py index 25b58c246..b491efaaa 100644 --- a/scrapy/tests/test_downloadermiddleware_httpcache.py +++ b/scrapy/tests/test_downloadermiddleware_httpcache.py @@ -1,3 +1,4 @@ +from __future__ import print_function import time import tempfile import shutil diff --git a/scrapy/tests/test_engine.py b/scrapy/tests/test_engine.py index 2bc1725b9..342edd798 100644 --- a/scrapy/tests/test_engine.py +++ b/scrapy/tests/test_engine.py @@ -10,6 +10,7 @@ module with the ``runserver`` argument:: python test_engine.py runserver """ +from __future__ import print_function import sys, os, re, urlparse from twisted.internet import reactor, defer diff --git a/scrapy/tests/test_pipeline_media.py b/scrapy/tests/test_pipeline_media.py index 1aff804ee..443894feb 100644 --- a/scrapy/tests/test_pipeline_media.py +++ b/scrapy/tests/test_pipeline_media.py @@ -1,3 +1,4 @@ +from __future__ import print_function from twisted.trial import unittest from twisted.python.failure import Failure from twisted.internet import reactor diff --git a/scrapy/tests/test_utils_request.py b/scrapy/tests/test_utils_request.py index 82116ac7b..c4a54c0ff 100644 --- a/scrapy/tests/test_utils_request.py +++ b/scrapy/tests/test_utils_request.py @@ -1,3 +1,4 @@ +from __future__ import print_function import unittest from scrapy.http import Request from scrapy.utils.request import request_fingerprint, _fingerprint_cache, \ diff --git a/scrapy/utils/display.py b/scrapy/utils/display.py index 536de6b88..f6a6c4645 100644 --- a/scrapy/utils/display.py +++ b/scrapy/utils/display.py @@ -2,6 +2,7 @@ pprint and pformat wrappers with colorization support """ +from __future__ import print_function import sys from pprint import pformat as pformat_ diff --git a/scrapy/utils/engine.py b/scrapy/utils/engine.py index 27d7afa0d..3bad4a541 100644 --- a/scrapy/utils/engine.py +++ b/scrapy/utils/engine.py @@ -1,5 +1,6 @@ """Some debugging functions for working with the Scrapy engine""" +from __future__ import print_function from time import time # used in global tests code def get_engine_status(engine): diff --git a/scrapy/utils/request.py b/scrapy/utils/request.py index c61e1fba1..3d65cb765 100644 --- a/scrapy/utils/request.py +++ b/scrapy/utils/request.py @@ -3,6 +3,7 @@ This module provides some useful functions for working with scrapy.http.Request objects """ +from __future__ import print_function import hashlib import weakref from urlparse import urlunparse diff --git a/scrapy/utils/testsite.py b/scrapy/utils/testsite.py index 949a55737..1c221b23c 100644 --- a/scrapy/utils/testsite.py +++ b/scrapy/utils/testsite.py @@ -1,3 +1,4 @@ +from __future__ import print_function import urlparse from twisted.internet import reactor diff --git a/scrapy/utils/trackref.py b/scrapy/utils/trackref.py index 13a8d9e5b..59d6e6727 100644 --- a/scrapy/utils/trackref.py +++ b/scrapy/utils/trackref.py @@ -9,6 +9,7 @@ and no performance penalty at all when disabled (as object_ref becomes just an alias to object in that case). """ +from __future__ import print_function import weakref, os from collections import defaultdict from time import time