From 76ed9d442b10f6a002625a32c6fcaeb01e8c84c1 Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Mon, 7 Jun 2010 15:11:25 -0300
Subject: [PATCH] Relocated some modules: * scrapy.spider.middelware moved to
 scrapy.core.spidermw * scrapy.core.scheduler.schedulers to
 scrapy.core.scheduler * scrapy.core.scheduler.middleware to
 scrapy.core.schedulermw

Also removed dir: scrapy/core/scheduler/

--HG--
rename : scrapy/core/scheduler/schedulers.py => scrapy/core/scheduler.py
rename : scrapy/core/scheduler/middleware.py => scrapy/core/schedulermw.py
rename : scrapy/spider/middleware.py => scrapy/core/spidermw.py
---
 scrapy/core/{scheduler/schedulers.py => scheduler.py}   | 2 +-
 scrapy/core/scheduler/__init__.py                       | 2 --
 scrapy/core/{scheduler/middleware.py => schedulermw.py} | 0
 scrapy/core/scraper.py                                  | 2 +-
 scrapy/{spider/middleware.py => core/spidermw.py}       | 0
 5 files changed, 2 insertions(+), 4 deletions(-)
 rename scrapy/core/{scheduler/schedulers.py => scheduler.py} (98%)
 delete mode 100644 scrapy/core/scheduler/__init__.py
 rename scrapy/core/{scheduler/middleware.py => schedulermw.py} (100%)
 rename scrapy/{spider/middleware.py => core/spidermw.py} (100%)

diff --git a/scrapy/core/scheduler/schedulers.py b/scrapy/core/scheduler.py
similarity index 98%
rename from scrapy/core/scheduler/schedulers.py
rename to scrapy/core/scheduler.py
index a30ae9d98..290ebefc1 100644
--- a/scrapy/core/scheduler/schedulers.py
+++ b/scrapy/core/scheduler.py
@@ -6,9 +6,9 @@ from twisted.internet import defer
 from twisted.python.failure import Failure
 
 from scrapy.utils.datatypes import PriorityQueue, PriorityStack
+from scrapy.core.schedulermw import SchedulerMiddlewareManager
 from scrapy.core.exceptions import IgnoreRequest
 from scrapy.conf import settings
-from .middleware import SchedulerMiddlewareManager
 
 class Scheduler(object):
     """The scheduler decides what to scrape next. In other words, it defines the
diff --git a/scrapy/core/scheduler/__init__.py b/scrapy/core/scheduler/__init__.py
deleted file mode 100644
index 5f28c6bf3..000000000
--- a/scrapy/core/scheduler/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from scrapy.core.scheduler.schedulers import Scheduler
-from scrapy.core.scheduler.middleware import SchedulerMiddlewareManager
diff --git a/scrapy/core/scheduler/middleware.py b/scrapy/core/schedulermw.py
similarity index 100%
rename from scrapy/core/scheduler/middleware.py
rename to scrapy/core/schedulermw.py
diff --git a/scrapy/core/scraper.py b/scrapy/core/scraper.py
index bd2240c49..d1e82fb98 100644
--- a/scrapy/core/scraper.py
+++ b/scrapy/core/scraper.py
@@ -12,7 +12,7 @@ from scrapy.core.exceptions import IgnoreRequest, DropItem
 from scrapy.core import signals
 from scrapy.http import Request, Response
 from scrapy.item import BaseItem
-from scrapy.spider.middleware import SpiderMiddlewareManager
+from scrapy.core.spidermw import SpiderMiddlewareManager
 from scrapy import log
 from scrapy.stats import stats
 from scrapy.conf import settings
diff --git a/scrapy/spider/middleware.py b/scrapy/core/spidermw.py
similarity index 100%
rename from scrapy/spider/middleware.py
rename to scrapy/core/spidermw.py