diff --git a/scrapy/cmdline.py b/scrapy/cmdline.py index 14787950b..a619c349a 100644 --- a/scrapy/cmdline.py +++ b/scrapy/cmdline.py @@ -8,7 +8,7 @@ import pkg_resources import scrapy from scrapy.crawler import CrawlerProcess from scrapy.xlib import lsprofcalltree -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.exceptions import UsageError from scrapy.utils.misc import walk_modules from scrapy.utils.project import inside_project, get_project_settings diff --git a/scrapy/command.py b/scrapy/commands/__init__.py similarity index 100% rename from scrapy/command.py rename to scrapy/commands/__init__.py diff --git a/scrapy/commands/bench.py b/scrapy/commands/bench.py index 7c056a990..90c8d56a2 100644 --- a/scrapy/commands/bench.py +++ b/scrapy/commands/bench.py @@ -5,7 +5,7 @@ import subprocess from six.moves.urllib.parse import urlencode import scrapy -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.linkextractors import LinkExtractor diff --git a/scrapy/commands/check.py b/scrapy/commands/check.py index bf07f360f..2917b8ba7 100644 --- a/scrapy/commands/check.py +++ b/scrapy/commands/check.py @@ -4,7 +4,7 @@ import sys from collections import defaultdict from unittest import TextTestRunner, TextTestResult as _TextTestResult -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.contracts import ContractsManager from scrapy.utils.misc import load_object from scrapy.utils.conf import build_component_list diff --git a/scrapy/commands/crawl.py b/scrapy/commands/crawl.py index b7fea7b80..72df11476 100644 --- a/scrapy/commands/crawl.py +++ b/scrapy/commands/crawl.py @@ -1,5 +1,5 @@ import os -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.utils.conf import arglist_to_dict from scrapy.exceptions import UsageError diff --git a/scrapy/commands/edit.py b/scrapy/commands/edit.py index 016c98d2d..2df6a730c 100644 --- a/scrapy/commands/edit.py +++ b/scrapy/commands/edit.py @@ -1,6 +1,6 @@ import sys, os -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.exceptions import UsageError class Command(ScrapyCommand): diff --git a/scrapy/commands/fetch.py b/scrapy/commands/fetch.py index 89809a177..e61eedf50 100644 --- a/scrapy/commands/fetch.py +++ b/scrapy/commands/fetch.py @@ -1,7 +1,7 @@ from __future__ import print_function from w3lib.url import is_url -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.http import Request from scrapy.exceptions import UsageError from scrapy.utils.spider import spidercls_for_request, DefaultSpider diff --git a/scrapy/commands/genspider.py b/scrapy/commands/genspider.py index 9d68ec845..2c14b3c1f 100644 --- a/scrapy/commands/genspider.py +++ b/scrapy/commands/genspider.py @@ -7,7 +7,7 @@ from importlib import import_module from os.path import join, dirname, abspath, exists, splitext import scrapy -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.utils.template import render_templatefile, string_camelcase from scrapy.exceptions import UsageError diff --git a/scrapy/commands/list.py b/scrapy/commands/list.py index 3b35cbb92..a255b3b94 100644 --- a/scrapy/commands/list.py +++ b/scrapy/commands/list.py @@ -1,5 +1,5 @@ from __future__ import print_function -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand class Command(ScrapyCommand): diff --git a/scrapy/commands/parse.py b/scrapy/commands/parse.py index 245b3fdf0..f90f7cdbc 100644 --- a/scrapy/commands/parse.py +++ b/scrapy/commands/parse.py @@ -3,7 +3,7 @@ import logging from w3lib.url import is_url -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.http import Request from scrapy.item import BaseItem from scrapy.utils import display diff --git a/scrapy/commands/runspider.py b/scrapy/commands/runspider.py index b67838619..88f5a3015 100644 --- a/scrapy/commands/runspider.py +++ b/scrapy/commands/runspider.py @@ -3,7 +3,7 @@ import os from importlib import import_module from scrapy.utils.spider import iter_spider_classes -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.exceptions import UsageError from scrapy.utils.conf import arglist_to_dict diff --git a/scrapy/commands/settings.py b/scrapy/commands/settings.py index b8e0fe08c..65a5cd465 100644 --- a/scrapy/commands/settings.py +++ b/scrapy/commands/settings.py @@ -1,5 +1,5 @@ from __future__ import print_function -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand class Command(ScrapyCommand): diff --git a/scrapy/commands/shell.py b/scrapy/commands/shell.py index cf99865c4..95af8586b 100644 --- a/scrapy/commands/shell.py +++ b/scrapy/commands/shell.py @@ -6,7 +6,7 @@ See documentation in docs/topics/shell.rst from threading import Thread -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.shell import Shell from scrapy.http import Request from scrapy.utils.spider import spidercls_for_request, DefaultSpider diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py index 5c8783ceb..0c77cad01 100644 --- a/scrapy/commands/startproject.py +++ b/scrapy/commands/startproject.py @@ -7,7 +7,7 @@ from os.path import join, exists, abspath from shutil import copytree, ignore_patterns import scrapy -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand from scrapy.utils.template import render_templatefile, string_camelcase from scrapy.exceptions import UsageError diff --git a/scrapy/commands/version.py b/scrapy/commands/version.py index 76b97200d..a48e98f75 100644 --- a/scrapy/commands/version.py +++ b/scrapy/commands/version.py @@ -5,7 +5,7 @@ import platform import twisted import scrapy -from scrapy.command import ScrapyCommand +from scrapy.commands import ScrapyCommand class Command(ScrapyCommand): diff --git a/scrapy/commands/view.py b/scrapy/commands/view.py index 679c51a67..4eb44f77d 100644 --- a/scrapy/commands/view.py +++ b/scrapy/commands/view.py @@ -1,5 +1,4 @@ -from scrapy.command import ScrapyCommand -from scrapy.commands import fetch +from scrapy.commands import fetch, ScrapyCommand from scrapy.utils.response import open_in_browser class Command(fetch.Command):