From 11bc122a54dacec840acf790e25e9c3b710203a9 Mon Sep 17 00:00:00 2001
From: olveyra <none@none>
Date: Mon, 14 Jul 2008 13:39:58 +0000
Subject: [PATCH] pickled settings must go in overrides settings not default,
 because of precedence

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%4063
---
 scrapy/trunk/scrapy/conf/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scrapy/trunk/scrapy/conf/__init__.py b/scrapy/trunk/scrapy/conf/__init__.py
index cd32f0802..af1cc3ec4 100644
--- a/scrapy/trunk/scrapy/conf/__init__.py
+++ b/scrapy/trunk/scrapy/conf/__init__.py
@@ -13,10 +13,10 @@ class Settings(object):
     core = None
 
     def __init__(self):
-        self.overrides = {}
+        pickled_settings = os.environ.get("SCRAPY_PICKLED_SETTINGS")
+        self.overrides = pickle.loads(pickled_settings) if pickled_settings else {}
         self.settings = self._import(SETTINGS_MODULE)
-        pickled_defaults = os.environ.get("SCRAPY_PICKLED_SETTINGS")
-        self.defaults = pickle.loads(pickled_defaults) if pickled_defaults else {}
+        self.defaults = {}
         self.core = self._import('scrapy.conf.core_settings')
 
     def _import(self, modulepath):