From 7ace23c3856bc03d05ee655ea276382077347fe1 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Tue, 11 Sep 2012 16:37:55 -0300 Subject: [PATCH] removed another instance of scrapy.conf singleton, this time from test_cmdline --- scrapy/tests/test_cmdline/__init__.py | 6 +++--- scrapy/tests/test_cmdline/extensions.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scrapy/tests/test_cmdline/__init__.py b/scrapy/tests/test_cmdline/__init__.py index 4bc2a0789..06db5824d 100644 --- a/scrapy/tests/test_cmdline/__init__.py +++ b/scrapy/tests/test_cmdline/__init__.py @@ -20,14 +20,14 @@ class CmdlineTest(unittest.TestCase): def test_default_settings(self): self.assertEqual(self._execute('settings', '--get', 'TEST1'), \ - 'default + loaded + started') + 'default + started') def test_override_settings_using_set_arg(self): self.assertEqual(self._execute('settings', '--get', 'TEST1', '-s', 'TEST1=override'), \ - 'override + loaded + started') + 'override + started') def test_override_settings_using_envvar(self): self.env['SCRAPY_TEST1'] = 'override' self.assertEqual(self._execute('settings', '--get', 'TEST1'), \ - 'override + loaded + started') + 'override + started') diff --git a/scrapy/tests/test_cmdline/extensions.py b/scrapy/tests/test_cmdline/extensions.py index 25176c7e2..a7acf1210 100644 --- a/scrapy/tests/test_cmdline/extensions.py +++ b/scrapy/tests/test_cmdline/extensions.py @@ -1,10 +1,10 @@ """A test extension used to check the settings loading order""" -from scrapy.conf import settings - -settings.overrides['TEST1'] = "%s + %s" % (settings['TEST1'], 'loaded') - class TestExtension(object): - def __init__(self): + def __init__(self, settings): settings.overrides['TEST1'] = "%s + %s" % (settings['TEST1'], 'started') + + @classmethod + def from_crawler(cls, crawler): + return cls(crawler.settings)