mirror of https://github.com/scrapy/scrapy.git
remove unused imports and some assorted pylint-ing
This commit is contained in:
parent
19ff9ac4f9
commit
da1f6d3144
|
|
@ -7,7 +7,7 @@ version_info = tuple(__version__.split('.')[:3])
|
|||
|
||||
import sys, os, warnings
|
||||
|
||||
if sys.version_info < (2,6):
|
||||
if sys.version_info < (2, 6):
|
||||
print "Scrapy %s requires Python 2.6 or above" % __version__
|
||||
sys.exit(1)
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class Command(ScrapyCommand):
|
|||
self.settings.overrides['FEED_URI'] = opts.output
|
||||
valid_output_formats = self.settings['FEED_EXPORTERS'].keys() + self.settings['FEED_EXPORTERS_BASE'].keys()
|
||||
if opts.output_format not in valid_output_formats:
|
||||
raise UsageError('Invalid/unrecognized output format: %s, Expected %s' % (opts.output_format,valid_output_formats))
|
||||
raise UsageError('Invalid/unrecognized output format: %s, Expected %s' % (opts.output_format, valid_output_formats))
|
||||
self.settings.overrides['FEED_FORMAT'] = opts.output_format
|
||||
|
||||
def run(self, args, opts):
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ from threading import Thread
|
|||
|
||||
from scrapy.command import ScrapyCommand
|
||||
from scrapy.shell import Shell
|
||||
from scrapy import log
|
||||
|
||||
class Command(ScrapyCommand):
|
||||
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ class PickleItemExporter(BaseItemExporter):
|
|||
|
||||
def __init__(self, file, protocol=2, **kwargs):
|
||||
self._configure(kwargs)
|
||||
self.file =file
|
||||
self.file = file
|
||||
self.protocol = protocol
|
||||
|
||||
def export_item(self, item):
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ from cStringIO import StringIO
|
|||
from tempfile import mktemp
|
||||
|
||||
from scrapy import log
|
||||
from scrapy.http import Response
|
||||
from scrapy.responsetypes import responsetypes
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,9 @@ from zope.interface import implements
|
|||
from twisted.internet import defer, reactor, protocol
|
||||
from twisted.web.http_headers import Headers as TxHeaders
|
||||
from twisted.web.iweb import IBodyProducer
|
||||
from twisted.web.http import PotentialDataLoss
|
||||
from twisted.internet.error import TimeoutError
|
||||
from scrapy.xlib.tx import Agent, ProxyAgent, ResponseDone, \
|
||||
HTTPConnectionPool, TCP4ClientEndpoint, ResponseFailed
|
||||
HTTPConnectionPool, TCP4ClientEndpoint
|
||||
|
||||
from scrapy.http import Headers
|
||||
from scrapy.responsetypes import responsetypes
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
from time import time
|
||||
from urlparse import urlparse, urlunparse, urldefrag
|
||||
|
||||
from twisted.internet.ssl import ClientContextFactory
|
||||
from twisted.web.client import HTTPClientFactory
|
||||
from twisted.web.http import HTTPClient
|
||||
from twisted.internet import defer
|
||||
from OpenSSL import SSL
|
||||
|
||||
from scrapy.http import Headers
|
||||
from scrapy.utils.httpobj import urlparse_cached
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
import socket
|
||||
|
||||
from twisted.internet import defer
|
||||
from twisted.internet.base import ThreadedResolver
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ See documentation in docs/topics/spiders.rst
|
|||
|
||||
from scrapy import log
|
||||
from scrapy.http import Request
|
||||
from scrapy.utils.misc import arg_to_iter
|
||||
from scrapy.utils.trackref import object_ref
|
||||
from scrapy.utils.url import url_is_from_spider
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import cgi
|
||||
import unittest
|
||||
import xmlrpclib
|
||||
from cStringIO import StringIO
|
||||
from urlparse import urlparse
|
||||
|
||||
from scrapy.http import Request, FormRequest, XmlRpcRequest, Headers, HtmlResponse
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class MustbeDeferredTest(unittest.TestCase):
|
|||
return steps
|
||||
|
||||
dfd = mustbe_deferred(_append, 1)
|
||||
dfd.addCallback(self.assertEqual, [1,2]) # it is [1] with maybeDeferred
|
||||
dfd.addCallback(self.assertEqual, [1, 2]) # it is [1] with maybeDeferred
|
||||
steps.append(2) # add another value, that should be catched by assertEqual
|
||||
return dfd
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ class MustbeDeferredTest(unittest.TestCase):
|
|||
return dfd
|
||||
|
||||
dfd = mustbe_deferred(_append, 1)
|
||||
dfd.addCallback(self.assertEqual, [1,2]) # it is [1] with maybeDeferred
|
||||
dfd.addCallback(self.assertEqual, [1, 2]) # it is [1] with maybeDeferred
|
||||
steps.append(2) # add another value, that should be catched by assertEqual
|
||||
return dfd
|
||||
|
||||
|
|
|
|||
|
|
@ -64,14 +64,14 @@ class UtilsMiscTestCase(unittest.TestCase):
|
|||
assert hasattr(arg_to_iter(None), '__iter__')
|
||||
assert hasattr(arg_to_iter(100), '__iter__')
|
||||
assert hasattr(arg_to_iter('lala'), '__iter__')
|
||||
assert hasattr(arg_to_iter([1,2,3]), '__iter__')
|
||||
assert hasattr(arg_to_iter([1, 2, 3]), '__iter__')
|
||||
assert hasattr(arg_to_iter(l for l in 'abcd'), '__iter__')
|
||||
|
||||
self.assertEqual(list(arg_to_iter(None)), [])
|
||||
self.assertEqual(list(arg_to_iter('lala')), ['lala'])
|
||||
self.assertEqual(list(arg_to_iter(100)), [100])
|
||||
self.assertEqual(list(arg_to_iter(l for l in 'abc')), ['a', 'b', 'c'])
|
||||
self.assertEqual(list(arg_to_iter([1,2,3])), [1,2,3])
|
||||
self.assertEqual(list(arg_to_iter([1, 2, 3])), [1, 2, 3])
|
||||
self.assertEqual(list(arg_to_iter({'a':1})), [{'a': 1}])
|
||||
self.assertEqual(list(arg_to_iter(TestItem(name="john"))), [TestItem(name="john")])
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue