From bc13a5924a0e89934ddfe35c795fff9e41894af9 Mon Sep 17 00:00:00 2001 From: elpolilla Date: Mon, 3 Nov 2008 12:28:00 +0000 Subject: [PATCH] Removed ugly loading of string codecs --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40357 --- scrapy/trunk/scrapy/contrib/codecs/__init__.py | 2 +- scrapy/trunk/scrapy/contrib/codecs/x_mac_roman.py | 4 +++- scrapy/trunk/scrapy/core/engine.py | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scrapy/trunk/scrapy/contrib/codecs/__init__.py b/scrapy/trunk/scrapy/contrib/codecs/__init__.py index 23b6387c9..2f9ca71c8 100644 --- a/scrapy/trunk/scrapy/contrib/codecs/__init__.py +++ b/scrapy/trunk/scrapy/contrib/codecs/__init__.py @@ -1 +1 @@ -from scrapy.contrib.codecs import x_mac_roman +from scrapy.contrib.codecs.x_mac_roman import XMacRomanCodec diff --git a/scrapy/trunk/scrapy/contrib/codecs/x_mac_roman.py b/scrapy/trunk/scrapy/contrib/codecs/x_mac_roman.py index 425092119..635300e97 100644 --- a/scrapy/trunk/scrapy/contrib/codecs/x_mac_roman.py +++ b/scrapy/trunk/scrapy/contrib/codecs/x_mac_roman.py @@ -311,4 +311,6 @@ def x_mac_roman_search_function(name): if name == 'x-mac-roman': return getregentry() -codecs.register(x_mac_roman_search_function) +class XMacRomanCodec(object): + def __init__(self): + codecs.register(x_mac_roman_search_function) diff --git a/scrapy/trunk/scrapy/core/engine.py b/scrapy/trunk/scrapy/core/engine.py index 34f396453..b8e9faace 100644 --- a/scrapy/trunk/scrapy/core/engine.py +++ b/scrapy/trunk/scrapy/core/engine.py @@ -20,7 +20,6 @@ from scrapy.item.pipeline import ItemPipeline from scrapy.spider import spiders from scrapy.spider.middleware import SpiderMiddlewareManager from scrapy.utils.defer import chain_deferred, defer_succeed, mustbe_deferred, deferred_degenerate -from scrapy.contrib import codecs class ExecutionEngine(object): """