From fde4f219a8c090b8a7a39d4c060ab643a8897f26 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Wed, 29 Jul 2009 18:41:15 -0300 Subject: [PATCH] don't use packages when modules are enough --HG-- rename : scrapy/extension/__init__.py => scrapy/extension.py rename : scrapy/fetcher/__init__.py => scrapy/fetcher.py rename : scrapy/log/__init__.py => scrapy/log.py rename : scrapy/mail/__init__.py => scrapy/mail.py rename : scrapy/patches/monkeypatches.py => scrapy/patches.py --- scrapy/__init__.py | 4 ++-- scrapy/{extension/__init__.py => extension.py} | 0 scrapy/{fetcher/__init__.py => fetcher.py} | 0 scrapy/{log/__init__.py => log.py} | 0 scrapy/{mail/__init__.py => mail.py} | 0 scrapy/{patches/monkeypatches.py => patches.py} | 0 scrapy/patches/__init__.py | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename scrapy/{extension/__init__.py => extension.py} (100%) rename scrapy/{fetcher/__init__.py => fetcher.py} (100%) rename scrapy/{log/__init__.py => log.py} (100%) rename scrapy/{mail/__init__.py => mail.py} (100%) rename scrapy/{patches/monkeypatches.py => patches.py} (100%) delete mode 100644 scrapy/patches/__init__.py diff --git a/scrapy/__init__.py b/scrapy/__init__.py index b873829a8..795e92d02 100644 --- a/scrapy/__init__.py +++ b/scrapy/__init__.py @@ -12,8 +12,8 @@ if sys.version_info < (2,5): sys.exit(1) # monkey patches to fix external library issues -from scrapy.patches import monkeypatches -monkeypatches.apply_patches() +from scrapy.patches import apply_patches +apply_patches() # optional_features is a set containing Scrapy optional features optional_features = set() diff --git a/scrapy/extension/__init__.py b/scrapy/extension.py similarity index 100% rename from scrapy/extension/__init__.py rename to scrapy/extension.py diff --git a/scrapy/fetcher/__init__.py b/scrapy/fetcher.py similarity index 100% rename from scrapy/fetcher/__init__.py rename to scrapy/fetcher.py diff --git a/scrapy/log/__init__.py b/scrapy/log.py similarity index 100% rename from scrapy/log/__init__.py rename to scrapy/log.py diff --git a/scrapy/mail/__init__.py b/scrapy/mail.py similarity index 100% rename from scrapy/mail/__init__.py rename to scrapy/mail.py diff --git a/scrapy/patches/monkeypatches.py b/scrapy/patches.py similarity index 100% rename from scrapy/patches/monkeypatches.py rename to scrapy/patches.py diff --git a/scrapy/patches/__init__.py b/scrapy/patches/__init__.py deleted file mode 100644 index e69de29bb..000000000